summaryrefslogtreecommitdiff
path: root/net/wireless/ibss.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-04-22 19:45:38 +0400
committerJohn W. Linville <linville@tuxdriver.com>2009-04-23 00:57:20 +0400
commit8e30bc55de98c000b0b836cb42525c82f605f191 (patch)
tree6b413976c2064157c3268b87921d4e2a7595f831 /net/wireless/ibss.c
parente255d5eb2b478eec1416b46aea03798b64355402 (diff)
downloadlinux-8e30bc55de98c000b0b836cb42525c82f605f191.tar.xz
nl80211: allow configuring IBSS beacon interval
Make the JOIN_IBSS command look at the beacon interval attribute to see if the user requested a specific beacon interval, if not default to 100 TU (wext too). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/ibss.c')
-rw-r--r--net/wireless/ibss.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index b5c601e1b1b7..3c38afaed28a 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -116,6 +116,9 @@ static int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
enum ieee80211_band band;
int i;
+ if (!wdev->wext.beacon_interval)
+ wdev->wext.beacon_interval = 100;
+
/* try to find an IBSS channel if none requested ... */
if (!wdev->wext.channel) {
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {