diff options
-rw-r--r-- | drivers/net/wireless/ath/ath5k/phy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 9306d5fda675..78c26fdccad1 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c | |||
@@ -1916,7 +1916,8 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode) | |||
1916 | struct ieee80211_channel *channel = ah->ah_current_channel; | 1916 | struct ieee80211_channel *channel = ah->ah_current_channel; |
1917 | bool use_def_for_tx, update_def_on_tx, use_def_for_rts, fast_div; | 1917 | bool use_def_for_tx, update_def_on_tx, use_def_for_rts, fast_div; |
1918 | bool use_def_for_sg; | 1918 | bool use_def_for_sg; |
1919 | u8 def_ant, tx_ant, ee_mode; | 1919 | int ee_mode; |
1920 | u8 def_ant, tx_ant; | ||
1920 | u32 sta_id1 = 0; | 1921 | u32 sta_id1 = 0; |
1921 | 1922 | ||
1922 | /* if channel is not initialized yet we can't set the antennas | 1923 | /* if channel is not initialized yet we can't set the antennas |
@@ -3081,7 +3082,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel, | |||
3081 | { | 3082 | { |
3082 | struct ath5k_rate_pcal_info rate_info; | 3083 | struct ath5k_rate_pcal_info rate_info; |
3083 | struct ieee80211_channel *curr_channel = ah->ah_current_channel; | 3084 | struct ieee80211_channel *curr_channel = ah->ah_current_channel; |
3084 | u8 type, ee_mode; | 3085 | int ee_mode; |
3086 | u8 type; | ||
3085 | int ret; | 3087 | int ret; |
3086 | 3088 | ||
3087 | if (txpower > AR5K_TUNE_MAX_TXPOWER) { | 3089 | if (txpower > AR5K_TUNE_MAX_TXPOWER) { |