mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
0b2c42ced2
This updates mac80211 to version 5.2-rc7, this contains all the changes to the wireless subsystem up to Linux 5.2-rc7. * The removed patches are applied upstream * b43 now uses kmod-lib-cordic * Update the nl80211.h file in iw to match backports version. * Remove the two backports from kernel 4.9, they were needed for mt76, but that can use the version from backports now, otherwise they collide and cause compile errors. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
686 B
Diff
35 lines
686 B
Diff
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -1143,25 +1143,25 @@ 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;
|
|
}
|
|
|
|
dmi_check_system(ath9k_quirks);
|
|
|
|
return 0;
|
|
|
|
- err_pci_exit:
|
|
- ath_pci_exit();
|
|
+ err_ahb_exit:
|
|
+ ath_ahb_exit();
|
|
err_out:
|
|
return error;
|
|
}
|