diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-06-12 15:38:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:11 -0400 |
commit | dc0ae30c31ee6ef83992bb692f37dfbba08a2ef6 (patch) | |
tree | cb13bf8b058797a290fb4b41e09acf783d1b7c78 /net/mac80211/mlme.c | |
parent | 5720508d9ad9a82927875252b7a19ba2b45f11f8 (diff) |
mac80211: fix beacon interval value
This patch fixes setting beacon interval
1. in register_hw it honors value requested by the driver
2. It uses default 100 instead of 1000 or 10000. Scanning for beacon
interval ~1sec and above is not sane
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 7f05820dc629..46f203740834 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -3583,7 +3583,7 @@ static int ieee80211_sta_create_ibss(struct net_device *dev, | |||
3583 | sband = local->hw.wiphy->bands[bss->band]; | 3583 | sband = local->hw.wiphy->bands[bss->band]; |
3584 | 3584 | ||
3585 | if (local->hw.conf.beacon_int == 0) | 3585 | if (local->hw.conf.beacon_int == 0) |
3586 | local->hw.conf.beacon_int = 10000; | 3586 | local->hw.conf.beacon_int = 100; |
3587 | bss->beacon_int = local->hw.conf.beacon_int; | 3587 | bss->beacon_int = local->hw.conf.beacon_int; |
3588 | bss->last_update = jiffies; | 3588 | bss->last_update = jiffies; |
3589 | bss->capability = WLAN_CAPABILITY_IBSS; | 3589 | bss->capability = WLAN_CAPABILITY_IBSS; |