---

yaml --- r: 351755 b: refs/heads/master c: 8da3493 h: refs/heads/master i: 351753: 5ce6b8b 351751: 06837fd v: v3
git-mirror · Jan 3, 2013 · 8cf216f · 8cf216f
1 parent a9fa9d1
commit 8cf216f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;