summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:25:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:25:52 -0400
commit373426cac0cbb7f762018127803dcd70838e2cdf (patch)
tree701322d66576c343051db9c091eb3805d340cdc3 /drivers/net/wireless/ath
parent46bf695802bb090d9d0d0fec6bb5b46c24b17d4e (diff)
parent44271488b91c9eecf249e075a1805dd887e222d2 (diff)
downloadblackbird-op-linux-373426cac0cbb7f762018127803dcd70838e2cdf.tar.gz
blackbird-op-linux-373426cac0cbb7f762018127803dcd70838e2cdf.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/ani.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 0496f965314f..45f477ad7608 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -544,7 +544,7 @@ static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah)
if (conf_is_ht40(conf))
return clockrate * 2;
- return clockrate * 2;
+ return clockrate;
}
static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
OpenPOWER on IntegriCloud