summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKarl Beldan <karl.beldan@rivierawaves.com>2013-11-19 17:12:05 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 16:56:54 +0100
commit24d47300d118c5909a51b7270276d749cce150a2 (patch)
treea67f66f8f4a1a29b040529928f2c5801d0bc8110 /net
parent5664da4429c177495256f958194c241625074ec0 (diff)
downloadlinux-24d47300d118c5909a51b7270276d749cce150a2.tar.gz
linux-24d47300d118c5909a51b7270276d749cce150a2.tar.bz2
linux-24d47300d118c5909a51b7270276d749cce150a2.zip
mac80211: set hw initial idle state
ATM, the first call of ieee80211_do_open will configure the hw as non-idle, even if the interface being brought up is not a monitor, and this leads to inconsistent sequences like: register_hw() do_open(sta) hw_config(non-idle) (.. sta is non-idle ..) scan(sta) hw_config(idle) (after scan finishes) do_stop(sta) do_open(sta) (.. sta is idle ..) Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e765f77bb97a..7d1c3ac48ed9 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -940,6 +940,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
result);
+ local->hw.conf.flags = IEEE80211_CONF_IDLE;
+
ieee80211_led_init(local);
rtnl_lock();