summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-08 10:36:51 -0700
committerDavid S. Miller <davem@davemloft.net>2010-10-08 10:36:51 -0700
commit94b105723a3bfca45c75916423cd959ce71ed215 (patch)
tree3138e19c9511738436dc75f773acde596f5973a2 /drivers/net
parentb530fb69cf54cf22768a3eabc0604d70b5c13fde (diff)
parent4efe7f51be508a13965f163006dcb32b38a914a3 (diff)
downloadop-kernel-dev-94b105723a3bfca45c75916423cd959ce71ed215.zip
op-kernel-dev-94b105723a3bfca45c75916423cd959ce71ed215.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
-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 cc648b6..a3d95cc 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -543,7 +543,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