aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-05 13:56:20 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-05 13:56:20 +0000
commitdd851373aefb3c16661bcdb1adcae749f78d1e5c (patch)
tree2a680a47a3d33ba547c7c93b46aeb45befe0caed /package/kernel
parent397301abce8a9d9709987af26c882ff74a82fe7a (diff)
downloadmaster-187ad058-dd851373aefb3c16661bcdb1adcae749f78d1e5c.tar.gz
master-187ad058-dd851373aefb3c16661bcdb1adcae749f78d1e5c.tar.bz2
master-187ad058-dd851373aefb3c16661bcdb1adcae749f78d1e5c.zip
mac80211: mwl8k: init devices synchronously
Make sure phys are probed and present before we detect wifis. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch
new file mode 100644
index 0000000000..75d82127ff
--- /dev/null
+++ b/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/wireless/mwl8k.c
++++ b/drivers/net/wireless/mwl8k.c
+@@ -6261,6 +6261,8 @@ static int mwl8k_probe(struct pci_dev *p
+
+ priv->running_bsses = 0;
+
++ wait_for_completion(&priv->firmware_loading_complete);
++
+ return rc;
+
+ err_stop_firmware:
+@@ -6294,8 +6296,6 @@ static void mwl8k_remove(struct pci_dev
+ return;
+ priv = hw->priv;
+
+- wait_for_completion(&priv->firmware_loading_complete);
+-
+ if (priv->fw_state == FW_STATE_ERROR) {
+ mwl8k_hw_reset(priv);
+ goto unmap;