diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-08 13:52:31 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-08 13:52:31 -0800 |
commit | c0c84ef5c130f8871adbdaac2ba824b9195cb6d9 (patch) | |
tree | d7221b5323d5a4d3d84676d32bdca21d21d85a18 /drivers/net/wireless/ath/ath9k/beacon.c | |
parent | enic: Update MAINTAINERS (diff) | |
parent | mac80211: remove unneeded check (diff) | |
download | linux-dev-c0c84ef5c130f8871adbdaac2ba824b9195cb6d9.tar.xz linux-dev-c0c84ef5c130f8871adbdaac2ba824b9195cb6d9.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/beacon.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 87ba44c06692..fcb36abfc309 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c @@ -721,8 +721,9 @@ void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif) cur_conf->beacon_interval = 100; /* - * Some times we dont parse dtim period from mac80211, in that case - * use a default value + * We don't parse dtim period from mac80211 during the driver + * initialization as it breaks association with hidden-ssid + * AP and it causes latency in roaming */ if (cur_conf->dtim_period == 0) cur_conf->dtim_period = 1; |