diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-04-23 23:35:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-30 20:34:26 -0400 |
| commit | 8b808bf29bdafe9270cb283ea093bb87f5a3be19 (patch) | |
| tree | d0f8bf9fd140fa18f1f51417a331357fbd3e0bd8 /net/mac80211 | |
| parent | 51ceddade0fb1e15f080b2555f3b3e1d68c6707e (diff) | |
| download | linux-8b808bf29bdafe9270cb283ea093bb87f5a3be19.tar.bz2 | |
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/mac80211')
| -rw-r--r-- | net/mac80211/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |