mac80211: update to wireless-testing 2014-03-31

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40393
This commit is contained in:
Felix Fietkau
2014-04-06 10:41:23 +00:00
parent c821836395
commit 4e155c80d3
57 changed files with 231 additions and 6494 deletions

View File

@@ -1,15 +1,15 @@
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -1112,23 +1112,23 @@ static int __init ath9k_init(void)
goto err_out;
}
@@ -892,23 +892,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_rate_unregister;
goto err_out;
}
- error = ath_ahb_init();
@@ -27,6 +27,6 @@
- ath_pci_exit();
+ err_ahb_exit:
+ ath_ahb_exit();
err_rate_unregister:
ath_rate_control_unregister();
err_out:
return error;
}