From: Eliad Peller <eliad@wizery.com>
Date: Mon, 2 Jul 2012 12:08:25 +0000 (+0300)
Subject: mac80211: always set in_reconfig=false on wakeup
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~12822^2~57^2~208^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c62094889f7bb0b3343d5404c9d139d2fb1712bb;p=mirror_ubuntu-zesty-kernel.git

mac80211: always set in_reconfig=false on wakeup

If the interfaces were removed just before a restart
work was started, open_count will be 0, and most of
the reconfig work will be skipped, including the
resetting of local->in_reconfig to false.

Leaving local->inconfig = true will result in
dropping any incoming packet.

Fix it by always setting local->in_reconfig = false
(even if there are no active interfaces).

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index cb73a0341af4..5715e7b3affc 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1415,10 +1415,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		if (ieee80211_sdata_running(sdata))
 			ieee80211_enable_keys(sdata);
 
+ wake_up:
 	local->in_reconfig = false;
 	barrier();
 
- wake_up:
 	/*
 	 * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
 	 * sessions can be established after a resume.