aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-04-23 23:35:09 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-04-30 20:34:26 -0400
commit8b808bf29bdafe9270cb283ea093bb87f5a3be19 (patch)
treed0f8bf9fd140fa18f1f51417a331357fbd3e0bd8 /net
parent51ceddade0fb1e15f080b2555f3b3e1d68c6707e (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/main.c1
1 files changed, 1 insertions, 0 deletions
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;