From 6911ee6ae5766a967e587c5587ca6542dac0741a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 23 Apr 2008 23:35:09 +0200
Subject: [PATCH] --- yaml --- r: 95866 b: refs/heads/master c:
 8b808bf29bdafe9270cb283ea093bb87f5a3be19 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1704380024e..e6557df4e904 100644
--- 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
index e9a978979d38..e12ffa172813 100644
--- 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;