aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index c1659d079513..cfa91ab7acf8 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -671,10 +671,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
671 if (!AR_SREV_9300_20_OR_LATER(ah)) 671 if (!AR_SREV_9300_20_OR_LATER(ah))
672 ah->ani_function &= ~ATH9K_ANI_MRC_CCK; 672 ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
673 673
674 /* disable ANI for 9340 */
675 if (AR_SREV_9340(ah))
676 ah->config.enable_ani = false;
677
678 ath9k_hw_init_mode_regs(ah); 674 ath9k_hw_init_mode_regs(ah);
679 675
680 if (!ah->is_pciexpress) 676 if (!ah->is_pciexpress)
@@ -2589,6 +2585,14 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
2589 } 2585 }
2590 2586
2591 2587
2588 if (AR_SREV_9280_20_OR_LATER(ah)) {
2589 pCap->hw_caps |= ATH9K_HW_WOW_DEVICE_CAPABLE |
2590 ATH9K_HW_WOW_PATTERN_MATCH_EXACT;
2591
2592 if (AR_SREV_9280(ah))
2593 pCap->hw_caps |= ATH9K_HW_WOW_PATTERN_MATCH_DWORD;
2594 }
2595
2592 return 0; 2596 return 0;
2593} 2597}
2594 2598
@@ -2908,9 +2912,9 @@ void ath9k_hw_reset_tsf(struct ath_hw *ah)
2908} 2912}
2909EXPORT_SYMBOL(ath9k_hw_reset_tsf); 2913EXPORT_SYMBOL(ath9k_hw_reset_tsf);
2910 2914
2911void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting) 2915void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set)
2912{ 2916{
2913 if (setting) 2917 if (set)
2914 ah->misc_mode |= AR_PCU_TX_ADD_TSF; 2918 ah->misc_mode |= AR_PCU_TX_ADD_TSF;
2915 else 2919 else
2916 ah->misc_mode &= ~AR_PCU_TX_ADD_TSF; 2920 ah->misc_mode &= ~AR_PCU_TX_ADD_TSF;