summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath5k/base.c
diff options
context:
space:
mode:
authorBruno Randolf2008-01-18 13:51:40 +0100
committerDavid S. Miller2008-01-29 00:10:50 +0100
commite535c1ac7e431f85e9c8ead6dbc977a1e1906736 (patch)
tree04eb2e73445240cb7d3745c219255269f1ea0da4 /drivers/net/wireless/ath5k/base.c
parentath5k: use 3 instead of 0x00000003 (diff)
downloadkernel-qcow2-linux-e535c1ac7e431f85e9c8ead6dbc977a1e1906736.tar.gz
kernel-qcow2-linux-e535c1ac7e431f85e9c8ead6dbc977a1e1906736.tar.xz
kernel-qcow2-linux-e535c1ac7e431f85e9c8ead6dbc977a1e1906736.zip
ath5k: beacon interval is in TU
the beacon interval is passed by mac80211 in TU already, so we can directly use it without conversion. also update the comments about TU (1 TU is defined by 802.11 as 1024usec). drivers/net/wireless/ath5k/ath5k.h: Changes-licensed-under: ISC drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD drivers/net/wireless/ath5k/base.h: Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bruno Randolf <bruno@thinktube.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
-rw-r--r--drivers/net/wireless/ath5k/base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 5ff115da91e3..de590163a07e 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2554,7 +2554,7 @@ ath5k_config(struct ieee80211_hw *hw,
{
struct ath5k_softc *sc = hw->priv;
- sc->bintval = conf->beacon_int * 1000 / 1024;
+ sc->bintval = conf->beacon_int;
ath5k_setcurmode(sc, conf->phymode);
return ath5k_chan_set(sc, conf->chan);
@@ -2570,7 +2570,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
/* Set to a reasonable value. Note that this will
* be set to mac80211's value at ath5k_config(). */
- sc->bintval = 1000 * 1000 / 1024;
+ sc->bintval = 1000;
mutex_lock(&sc->lock);
if (sc->vif != vif) {
ret = -EIO;