---

yaml --- r: 95866 b: refs/heads/master c: 8b808bf h: refs/heads/master v: v3
git-mirror · May 1, 2008 · 6911ee6 · 6911ee6
1 parent 07057cd
commit 6911ee6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ceddade0fb1e15f080b2555f3b3e1d68c6707e
+refs/heads/master: 8b808bf29bdafe9270cb283ea093bb87f5a3be19
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
@@ -975,6 +975,7 @@ static int __ieee80211_if_config(struct net_device *dev,
 		conf.ssid_len = sdata->u.sta.ssid_len;
 	} else if (ieee80211_vif_is_mesh(&sdata->vif)) {
 		conf.beacon = beacon;
+		conf.beacon_control = control;
 		ieee80211_start_mesh(dev);
 	} else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {
 		conf.ssid = sdata->u.ap.ssid;