diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 6ebc68bca91f..5fb1bf33faa0 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1170,7 +1170,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah, | |||
1170 | channel->max_antenna_gain * 2, | 1170 | channel->max_antenna_gain * 2, |
1171 | channel->max_power * 2, | 1171 | channel->max_power * 2, |
1172 | min((u32) MAX_RATE_POWER, | 1172 | min((u32) MAX_RATE_POWER, |
1173 | (u32) regulatory->power_limit)); | 1173 | (u32) regulatory->power_limit), false); |
1174 | 1174 | ||
1175 | ath9k_hw_rfbus_done(ah); | 1175 | ath9k_hw_rfbus_done(ah); |
1176 | 1176 | ||
@@ -2176,7 +2176,7 @@ bool ath9k_hw_disable(struct ath_hw *ah) | |||
2176 | } | 2176 | } |
2177 | EXPORT_SYMBOL(ath9k_hw_disable); | 2177 | EXPORT_SYMBOL(ath9k_hw_disable); |
2178 | 2178 | ||
2179 | void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit) | 2179 | void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test) |
2180 | { | 2180 | { |
2181 | struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); | 2181 | struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); |
2182 | struct ath9k_channel *chan = ah->curchan; | 2182 | struct ath9k_channel *chan = ah->curchan; |
@@ -2189,7 +2189,7 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit) | |||
2189 | channel->max_antenna_gain * 2, | 2189 | channel->max_antenna_gain * 2, |
2190 | channel->max_power * 2, | 2190 | channel->max_power * 2, |
2191 | min((u32) MAX_RATE_POWER, | 2191 | min((u32) MAX_RATE_POWER, |
2192 | (u32) regulatory->power_limit)); | 2192 | (u32) regulatory->power_limit), test); |
2193 | } | 2193 | } |
2194 | EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit); | 2194 | EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit); |
2195 | 2195 | ||
@@ -2323,11 +2323,10 @@ static u32 rightmost_index(struct ath_gen_timer_table *timer_table, u32 *mask) | |||
2323 | return timer_table->gen_timer_index[b]; | 2323 | return timer_table->gen_timer_index[b]; |
2324 | } | 2324 | } |
2325 | 2325 | ||
2326 | u32 ath9k_hw_gettsf32(struct ath_hw *ah) | 2326 | static u32 ath9k_hw_gettsf32(struct ath_hw *ah) |
2327 | { | 2327 | { |
2328 | return REG_READ(ah, AR_TSF_L32); | 2328 | return REG_READ(ah, AR_TSF_L32); |
2329 | } | 2329 | } |
2330 | EXPORT_SYMBOL(ath9k_hw_gettsf32); | ||
2331 | 2330 | ||
2332 | struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah, | 2331 | struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah, |
2333 | void (*trigger)(void *), | 2332 | void (*trigger)(void *), |