From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 14 Dec 2012 13:17:26 +0000 (+0100)
Subject: mac80211: reconfig bss_info_changed only if beaconing
X-Git-Tag: firefly_0821_release~3680^2~1092^2~242^2^2~125
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8da349329ae52462253052f804ef30d086c9911a;p=firefly-linux-kernel-4.4.55.git

mac80211: reconfig bss_info_changed only if beaconing

For AP/IBSS/mesh interfaces, call the driver to reconfigure
bss_info_changed only if the interface was beaconing before
suspend, otherwise we call the driver and it might interpret
the change as going from enabled to disabled.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 2e2e13bf96b2..e27c89c27bf4 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1555,9 +1555,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 
 			/* fall through */
 		case NL80211_IFTYPE_MESH_POINT:
-			changed |= BSS_CHANGED_BEACON |
-				   BSS_CHANGED_BEACON_ENABLED;
-			ieee80211_bss_info_change_notify(sdata, changed);
+			if (sdata->vif.bss_conf.enable_beacon) {
+				changed |= BSS_CHANGED_BEACON |
+					   BSS_CHANGED_BEACON_ENABLED;
+				ieee80211_bss_info_change_notify(sdata, changed);
+			}
 			break;
 		case NL80211_IFTYPE_WDS:
 			break;