From 8b808bf29bdafe9270cb283ea093bb87f5a3be19 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 23 Apr 2008 23:35:09 +0200 Subject: 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 Signed-off-by: John W. Linville --- net/mac80211/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index e9a978979d38..e12ffa172813 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; -- cgit v1.2.2