mac80211: rebase ontop of v4.18.5

Signed-off-by: John Crispin <john@phrozen.org>

1 files changed, 36 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/ath/501-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/ath/501-ath9k_ahb_init.patch
new file mode 100644
index 0000000000..9c194b07b8
--- /dev/null
+++ b/package/kernel/mac80211/patches/ath/501-ath9k_ahb_init.patch
@@ -0,0 +1,36 @@
+Index: backports-v4.18-rc7/drivers/net/wireless/ath/ath9k/init.c
+===================================================================
+--- backports-v4.18-rc7.orig/drivers/net/wireless/ath/ath9k/init.c
++++ backports-v4.18-rc7/drivers/net/wireless/ath/ath9k/init.c
+@@ -1144,25 +1144,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;
+ }