diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-18 19:06:45 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-06-19 11:50:23 -0400 |
commit | eab0cd493c08632ef10624d0169849c973951c66 (patch) | |
tree | 80d368d13516a5f285c5a4dadb9fd8f21abb2ec6 /drivers/net/wireless | |
parent | 488f7e0cdd99e7dc75dbe32d78474c070deadaea (diff) |
ath5k: fix beacon_int handling
73ca5203366235f8a43e490767284ba8cfd8c479
(ath5k: remove conf->beacon_int usage)
removed bintval setting from ath5k_config. We need to init the
interval earlier and don't touch it in add_interface anymore.
Otherwise it will be set only once by upper layer through
bss_info_changed but not on second and further hostap executions.
We ended up having bintval 1000 which rendered the AP useless on
many clients.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
Cc: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index fc5ba0e3a681..ea045151f953 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -538,6 +538,7 @@ ath5k_pci_probe(struct pci_dev *pdev, | |||
538 | sc->iobase = mem; /* So we can unmap it on detach */ | 538 | sc->iobase = mem; /* So we can unmap it on detach */ |
539 | sc->cachelsz = csz * sizeof(u32); /* convert to bytes */ | 539 | sc->cachelsz = csz * sizeof(u32); /* convert to bytes */ |
540 | sc->opmode = NL80211_IFTYPE_STATION; | 540 | sc->opmode = NL80211_IFTYPE_STATION; |
541 | sc->bintval = 1000; | ||
541 | mutex_init(&sc->lock); | 542 | mutex_init(&sc->lock); |
542 | spin_lock_init(&sc->rxbuflock); | 543 | spin_lock_init(&sc->rxbuflock); |
543 | spin_lock_init(&sc->txbuflock); | 544 | spin_lock_init(&sc->txbuflock); |
@@ -2755,9 +2756,6 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, | |||
2755 | goto end; | 2756 | goto end; |
2756 | } | 2757 | } |
2757 | 2758 | ||
2758 | /* Set to a reasonable value. Note that this will | ||
2759 | * be set to mac80211's value at ath5k_config(). */ | ||
2760 | sc->bintval = 1000; | ||
2761 | ath5k_hw_set_lladdr(sc->ah, conf->mac_addr); | 2759 | ath5k_hw_set_lladdr(sc->ah, conf->mac_addr); |
2762 | 2760 | ||
2763 | ret = 0; | 2761 | ret = 0; |