mac80211: assign conf.beacon_control for mesh
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 23 Apr 2008 21:35:09 +0000 (23:35 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 1 May 2008 00:34:26 +0000 (20:34 -0400)
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>
net/mac80211/main.c

index e9a978979d38553188163f1b632360233735a401..e12ffa172813e193264198fa72108eab5bedba23 100644 (file)
@@ -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;