mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 14:04:26 -04:00
a8f63a0717
This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
33 lines
650 B
Diff
33 lines
650 B
Diff
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -1088,23 +1088,23 @@ static int __init ath9k_init(void)
|
|
{
|
|
int error;
|
|
|
|
- error = ath_pci_init();
|
|
+ error = ath_ahb_init();
|
|
if (error < 0) {
|
|
- pr_err("No PCI devices found, driver not installed\n");
|
|
error = -ENODEV;
|
|
goto err_out;
|
|
}
|
|
|
|
- error = ath_ahb_init();
|
|
+ error = ath_pci_init();
|
|
if (error < 0) {
|
|
+ pr_err("No PCI devices found, driver not installed\n");
|
|
error = -ENODEV;
|
|
- goto err_pci_exit;
|
|
+ goto err_ahb_exit;
|
|
}
|
|
|
|
return 0;
|
|
|
|
- err_pci_exit:
|
|
- ath_pci_exit();
|
|
+ err_ahb_exit:
|
|
+ ath_ahb_exit();
|
|
err_out:
|
|
return error;
|
|
}
|