From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 23 Apr 2008 21:35:09 +0000 (+0200)
Subject: mac80211: assign conf.beacon_control for mesh
X-Git-Tag: v2.6.26-rc1~5^2~35^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8b808bf29bdafe9270cb283ea093bb87f5a3be19;p=linux-2.6-omap-h63xx.git

mac80211: assign conf.beacon_control for mesh

Drivers can rightfully assume that they get a beacon_control
if the beacon is set.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e9a978979d3..e12ffa17281 100644
--- a/net/mac80211/main.c
+++ b/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;