diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-11-14 11:23:07 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 14:28:44 -0500 |
| commit | 957708f1a2d3fd41021ea0282e1cd856d23df9ca (patch) | |
| tree | 5b85cbcab42ebbdfe05271778f1b10a9cd4cfc3e /drivers/net/wireless/ath/ath5k/reset.c | |
| parent | c32f5bbb00cf268f76e977d8cf9c75fa3a89c038 (diff) | |
| download | blackbird-obmc-linux-957708f1a2d3fd41021ea0282e1cd856d23df9ca.tar.gz blackbird-obmc-linux-957708f1a2d3fd41021ea0282e1cd856d23df9ca.zip | |
ath5k: precedence error in ath5k_hw_nic_wakeup()
'|' has higher precedence than ?:. Since AR5K_PHY_TURBO_MODE is 0x1 and
"AR5K_PHY_TURBO_MODE | (ah->ah_radio == AR5K_RF2425)" is true then we
always set turbo to zero.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/reset.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/reset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c index 0c2dd4771c36..4084b1076286 100644 --- a/drivers/net/wireless/ath/ath5k/reset.c +++ b/drivers/net/wireless/ath/ath5k/reset.c @@ -789,9 +789,9 @@ ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel) * (I don't think it supports 44MHz) */ /* On 2425 initvals TURBO_SHORT is not present */ if (ah->ah_bwmode == AR5K_BWMODE_40MHZ) { - turbo = AR5K_PHY_TURBO_MODE | - (ah->ah_radio == AR5K_RF2425) ? 0 : - AR5K_PHY_TURBO_SHORT; + turbo = AR5K_PHY_TURBO_MODE; + if (ah->ah_radio != AR5K_RF2425) + turbo |= AR5K_PHY_TURBO_SHORT; } else if (ah->ah_bwmode != AR5K_BWMODE_DEFAULT) { if (ah->ah_radio == AR5K_RF5413) { mode |= (ah->ah_bwmode == AR5K_BWMODE_10MHZ) ? |
