From 8cf216fb32e480c8b7102094fefce8dce7fa4533 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 14 Dec 2012 14:17:26 +0100
Subject: [PATCH] --- yaml --- r: 351755 b: refs/heads/master c:
 8da349329ae52462253052f804ef30d086c9911a h: refs/heads/master i:   351753:
 5ce6b8ba1773e4adb62fb4194b463c4bbf8f38b1   351751:
 06837fda91f698e7097eb5852ccf5b2501933a60 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/util.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a43334f0b160..26df4c4edc21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a83228823fc0cc8d79d95c9f0bf568b7317862
+refs/heads/master: 8da349329ae52462253052f804ef30d086c9911a
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 2e2e13bf96b2..e27c89c27bf4 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/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;