diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-12-14 12:03:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-18 15:23:29 -0500 |
commit | 49685634c6cb943ba9b35ff182ee479ca5b73302 (patch) | |
tree | 22dbce6bd64f855694800508840327182dd96cde | |
parent | ae0c40314a86c5c942d32d9cbbc9f96d70839935 (diff) |
ath9k_hw: remove additional_swba_backoff
It is unused
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 3e23abbcf084..073346abc3f0 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -441,7 +441,6 @@ static void ath9k_hw_init_config(struct ath_hw *ah) | |||
441 | { | 441 | { |
442 | ah->config.dma_beacon_response_time = 1; | 442 | ah->config.dma_beacon_response_time = 1; |
443 | ah->config.sw_beacon_response_time = 6; | 443 | ah->config.sw_beacon_response_time = 6; |
444 | ah->config.additional_swba_backoff = 0; | ||
445 | ah->config.ack_6mb = 0x0; | 444 | ah->config.ack_6mb = 0x0; |
446 | ah->config.cwm_ignore_extcca = 0; | 445 | ah->config.cwm_ignore_extcca = 0; |
447 | ah->config.analog_shiftreg = 1; | 446 | ah->config.analog_shiftreg = 1; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 57d3d0c3a99f..2ef9d2472a96 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -280,7 +280,6 @@ struct ath9k_hw_capabilities { | |||
280 | struct ath9k_ops_config { | 280 | struct ath9k_ops_config { |
281 | int dma_beacon_response_time; | 281 | int dma_beacon_response_time; |
282 | int sw_beacon_response_time; | 282 | int sw_beacon_response_time; |
283 | int additional_swba_backoff; | ||
284 | int ack_6mb; | 283 | int ack_6mb; |
285 | u32 cwm_ignore_extcca; | 284 | u32 cwm_ignore_extcca; |
286 | u32 pcie_waen; | 285 | u32 pcie_waen; |
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index a8504822b4fd..89d7e206992b 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c | |||
@@ -481,8 +481,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q) | |||
481 | | AR_Q_MISC_CBR_INCR_DIS0); | 481 | | AR_Q_MISC_CBR_INCR_DIS0); |
482 | value = (qi->tqi_readyTime - | 482 | value = (qi->tqi_readyTime - |
483 | (ah->config.sw_beacon_response_time - | 483 | (ah->config.sw_beacon_response_time - |
484 | ah->config.dma_beacon_response_time) - | 484 | ah->config.dma_beacon_response_time)) * 1024; |
485 | ah->config.additional_swba_backoff) * 1024; | ||
486 | REG_WRITE(ah, AR_QRDYTIMECFG(q), | 485 | REG_WRITE(ah, AR_QRDYTIMECFG(q), |
487 | value | AR_Q_RDYTIMECFG_EN); | 486 | value | AR_Q_RDYTIMECFG_EN); |
488 | REG_SET_BIT(ah, AR_DMISC(q), | 487 | REG_SET_BIT(ah, AR_DMISC(q), |