diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 19:36:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 19:36:51 +0200 |
| commit | 94b105723a3bfca45c75916423cd959ce71ed215 (patch) | |
| tree | 3138e19c9511738436dc75f773acde596f5973a2 /drivers/net | |
| parent | isdn: strcpy() => strlcpy() (diff) | |
| parent | Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath" (diff) | |
| download | linux-94b105723a3bfca45c75916423cd959ce71ed215.tar.xz linux-94b105723a3bfca45c75916423cd959ce71ed215.zip | |
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.c | 2 |
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 cc648b6ae31c..a3d95cca8f0c 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) |