summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-02-10 21:25:38 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-02-13 13:45:20 -0500
commit5e1333624827e7a91b2d2cc04ce978f050cae15e (patch)
tree4016a7c7a5ccda41cbcaed17173445446eaed1b9 /net/mac80211/main.c
parent570a0a7c3ba6e44b0fe7f1d42e69ba139b533737 (diff)
downloadlinux-5e1333624827e7a91b2d2cc04ce978f050cae15e.tar.bz2
mac80211: disable IBSS beacon before join
Before we have a probe response frame (which is used as the beacon too) there's no need to ask drivers to beacon, they will not get a beacon anyway. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index caf92424c76d..956afea4214d 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -210,6 +210,8 @@ int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 changed)
!!rcu_dereference(sdata->u.ap.beacon);
break;
case NL80211_IFTYPE_ADHOC:
+ conf.enable_beacon = !!sdata->u.sta.probe_resp;
+ break;
case NL80211_IFTYPE_MESH_POINT:
conf.enable_beacon = true;
break;