From: Karl Beldan <karl.beldan@rivierawaves.com>
Date: Tue, 19 Nov 2013 16:12:05 +0000 (+0100)
Subject: mac80211: set hw initial idle state
X-Git-Tag: next-20131128~82^2^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=24d47300d118c5909a51b7270276d749cce150a2;p=karo-tx-linux.git

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>
---

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();