From: Eliad Peller <eliad@wizery.com>
Date: Wed, 10 Jun 2015 17:19:37 +0000 (+0300)
Subject: mac80211: clear local->in_reconfig on reconfig error
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~5986^2~155^2~44
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7584f88f9e30d36c2c1041831121f1cd3a194bf1;p=mirror_ubuntu-zesty-kernel.git

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

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