diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-11-04 12:58:14 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-11-04 12:58:52 +0100 |
commit | 6aa07b82027fa071ebcecf5fe03ecaeca7ec39b2 (patch) | |
tree | bec1bbc767d29ce682332509d80a3115a09a35c8 | |
parent | 9f61ccd9e34fab1a1b90b846c1144e885401e70a (diff) | |
download | upstream-6aa07b82027fa071ebcecf5fe03ecaeca7ec39b2.tar.gz upstream-6aa07b82027fa071ebcecf5fe03ecaeca7ec39b2.tar.bz2 upstream-6aa07b82027fa071ebcecf5fe03ecaeca7ec39b2.zip |
Revert "mac80211: remove ath10k delayed initialization hack"
This reverts commit efd9dec3195c603289ebb552f8650da9dd869828.
ath10k can take a long time to probe, long enough for netifd to fail to
initialize already configured wireless devices
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r-- | package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch new file mode 100644 index 0000000000..e417eb8ffa --- /dev/null +++ b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch @@ -0,0 +1,33 @@ +From: Sven Eckelmann <sven@open-mesh.com> +Date: Tue, 18 Nov 2014 12:29:28 +0100 +Subject: [PATCH] ath10k: Don't initialize devices asynchronously + +OpenWrt requires all PHYs to be initialized to create the configuration files +during bootup. ath10k violates this because it delays the creation of the PHY +to a not well defined point in the future. + +Forcing the work to be done immediately works around this problem but may also +delay the boot when firmware images cannot be found. + +Signed-off-by: Sven Eckelmann <sven@open-mesh.com> +--- + +--- a/drivers/net/wireless/ath/ath10k/core.c ++++ b/drivers/net/wireless/ath/ath10k/core.c +@@ -2220,6 +2220,16 @@ int ath10k_core_register(struct ath10k * + ar->chip_id = chip_id; + queue_work(ar->workqueue, &ar->register_work); + ++ /* OpenWrt requires all PHYs to be initialized to create the ++ * configuration files during bootup. ath10k violates this ++ * because it delays the creation of the PHY to a not well defined ++ * point in the future. ++ * ++ * Forcing the work to be done immediately works around this problem ++ * but may also delay the boot when firmware images cannot be found. ++ */ ++ flush_workqueue(ar->workqueue); ++ + return 0; + } + EXPORT_SYMBOL(ath10k_core_register); |