summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2015-06-10 20:19:37 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-07-17 16:38:10 +0300
commit7584f88f9e30d36c2c1041831121f1cd3a194bf1 (patch)
tree734d9c434e72a699304dc54443380d8a8655d7cd /net/mac80211
parent6513e98e05ccb8eca77adaf93beae44aa7bf4a45 (diff)
downloadlinux-7584f88f9e30d36c2c1041831121f1cd3a194bf1.tar.xz
mac80211: clear local->in_reconfig on reconfig error
If reconfiguration fails, local->in_reconfig is never cleaned, resulting in rx frames being dropped next time the device is started. Signed-off-by: Eliad Peller <eliadx.peller@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/util.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 89e089c452c1..e54596f95663 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1665,6 +1665,7 @@ static void ieee80211_handle_reconfig_failure(struct ieee80211_local *local)
local->resuming = false;
local->suspended = false;
local->started = false;
+ local->in_reconfig = false;
/* scheduled scan clearly can't be running any more, but tell
* cfg80211 and clear local state