diff options
-rw-r--r-- | drivers/net/wireless/ath/ath5k/ath5k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/attach.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/pcu.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index b96bb985b56d..42e6e821259e 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h | |||
@@ -1041,7 +1041,6 @@ struct ath5k_hw { | |||
1041 | #define ah_modes ah_capabilities.cap_mode | 1041 | #define ah_modes ah_capabilities.cap_mode |
1042 | #define ah_ee_version ah_capabilities.cap_eeprom.ee_version | 1042 | #define ah_ee_version ah_capabilities.cap_eeprom.ee_version |
1043 | 1043 | ||
1044 | u32 ah_atim_window; | ||
1045 | u32 ah_limit_tx_retries; | 1044 | u32 ah_limit_tx_retries; |
1046 | u8 ah_coverage_class; | 1045 | u8 ah_coverage_class; |
1047 | 1046 | ||
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index 6e02de311cdd..cd0b14a0a93a 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c | |||
@@ -118,7 +118,6 @@ int ath5k_hw_attach(struct ath5k_softc *sc) | |||
118 | ah->ah_turbo = false; | 118 | ah->ah_turbo = false; |
119 | ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER; | 119 | ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER; |
120 | ah->ah_imr = 0; | 120 | ah->ah_imr = 0; |
121 | ah->ah_atim_window = 0; | ||
122 | ah->ah_limit_tx_retries = AR5K_INIT_TX_RETRY; | 121 | ah->ah_limit_tx_retries = AR5K_INIT_TX_RETRY; |
123 | ah->ah_software_retry = false; | 122 | ah->ah_software_retry = false; |
124 | ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT; | 123 | ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT; |
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c index 6a891c4484a0..71dca1023e72 100644 --- a/drivers/net/wireless/ath/ath5k/pcu.c +++ b/drivers/net/wireless/ath/ath5k/pcu.c | |||
@@ -600,7 +600,7 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval) | |||
600 | /* Timer3 marks the end of our ATIM window | 600 | /* Timer3 marks the end of our ATIM window |
601 | * a zero length window is not allowed because | 601 | * a zero length window is not allowed because |
602 | * we 'll get no beacons */ | 602 | * we 'll get no beacons */ |
603 | timer3 = next_beacon + (ah->ah_atim_window ? ah->ah_atim_window : 1); | 603 | timer3 = next_beacon + 1; |
604 | 604 | ||
605 | /* | 605 | /* |
606 | * Set the beacon register and enable all timers. | 606 | * Set the beacon register and enable all timers. |