ath9k: Remove a few unused flags

[mirror_ubuntu-bionic-kernel.git] / drivers / net / wireless / ath9k / hw.c

diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 15e4d422cad4f9910f29de42dd7552ad5cf57446..13d8c2a4efae92711fae3e762794e4747814343c 100644 (file)
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -363,10 +363,7 @@ static void ath9k_hw_set_defaults(struct ath_hw *ah)
        ah->config.ack_6mb = 0x0;
        ah->config.cwm_ignore_extcca = 0;
        ah->config.pcie_powersave_enable = 0;
-       ah->config.pcie_l1skp_enable = 0;
        ah->config.pcie_clock_req = 0;
-       ah->config.pcie_power_reset = 0x100;
-       ah->config.pcie_restore = 0;
        ah->config.pcie_waen = 0;
        ah->config.analog_shiftreg = 1;
        ah->config.ht_enable = 1;
@@ -375,13 +372,6 @@ static void ath9k_hw_set_defaults(struct ath_hw *ah)
        ah->config.cck_trig_high = 200;
        ah->config.cck_trig_low = 100;
        ah->config.enable_ani = 1;
-       ah->config.noise_immunity_level = 4;
-       ah->config.ofdm_weaksignal_det = 1;
-       ah->config.cck_weaksignal_thr = 0;
-       ah->config.spur_immunity_level = 2;
-       ah->config.firstep_level = 0;
-       ah->config.rssi_thr_high = 40;
-       ah->config.rssi_thr_low = 7;
        ah->config.diversity_control = 0;
        ah->config.antenna_switch_swap = 0;
 
@@ -1448,6 +1438,7 @@ static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
                REG_CLR_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
                break;
        case NL80211_IFTYPE_ADHOC:
+       case NL80211_IFTYPE_MESH_POINT:
                REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_ADHOC
                          | AR_STA_ID1_KSRCH_MODE);
                REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
@@ -3149,6 +3140,7 @@ void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period)
                flags |= AR_TBTT_TIMER_EN;
                break;
        case NL80211_IFTYPE_ADHOC:
+       case NL80211_IFTYPE_MESH_POINT:
                REG_SET_BIT(ah, AR_TXCFG,
                            AR_TXCFG_ADHOC_BEACON_ATIM_TX_POLICY);
                REG_WRITE(ah, AR_NEXT_NDP_TIMER,
@@ -3341,8 +3333,6 @@ bool ath9k_hw_fill_cap_info(struct ath_hw *ah)
        pCap->hw_caps |= ATH9K_HW_CAP_MIC_TKIP;
        pCap->hw_caps |= ATH9K_HW_CAP_MIC_AESCCM;
 
-       pCap->hw_caps |= ATH9K_HW_CAP_CHAN_SPREAD;
-
        if (ah->config.ht_enable)
                pCap->hw_caps |= ATH9K_HW_CAP_HT;
        else
@@ -3366,7 +3356,6 @@ bool ath9k_hw_fill_cap_info(struct ath_hw *ah)
                pCap->keycache_size = AR_KEYTABLE_SIZE;
 
        pCap->hw_caps |= ATH9K_HW_CAP_FASTCC;
-       pCap->num_mr_retries = 4;
        pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
 
        if (AR_SREV_9285_10_OR_LATER(ah))
@@ -3376,14 +3365,6 @@ bool ath9k_hw_fill_cap_info(struct ath_hw *ah)
        else
                pCap->num_gpio_pins = AR_NUM_GPIO;
 
-       if (AR_SREV_9280_10_OR_LATER(ah)) {
-               pCap->hw_caps |= ATH9K_HW_CAP_WOW;
-               pCap->hw_caps |= ATH9K_HW_CAP_WOW_MATCHPATTERN_EXACT;
-       } else {
-               pCap->hw_caps &= ~ATH9K_HW_CAP_WOW;
-               pCap->hw_caps &= ~ATH9K_HW_CAP_WOW_MATCHPATTERN_EXACT;
-       }
-
        if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah)) {
                pCap->hw_caps |= ATH9K_HW_CAP_CST;
                pCap->rts_aggr_limit = ATH_AMPDU_LIMIT_MAX;