diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 13:36:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 13:36:51 -0400 |
| commit | 94b105723a3bfca45c75916423cd959ce71ed215 (patch) | |
| tree | 3138e19c9511738436dc75f773acde596f5973a2 /drivers/net | |
| parent | b530fb69cf54cf22768a3eabc0604d70b5c13fde (diff) | |
| parent | 4efe7f51be508a13965f163006dcb32b38a914a3 (diff) | |
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) | |||
| 543 | if (conf_is_ht40(conf)) | 543 | if (conf_is_ht40(conf)) |
| 544 | return clockrate * 2; | 544 | return clockrate * 2; |
| 545 | 545 | ||
| 546 | return clockrate * 2; | 546 | return clockrate; |
| 547 | } | 547 | } |
| 548 | 548 | ||
| 549 | static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah) | 549 | static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah) |