1 --- a/drivers/net/wireless/ath/ath9k/hw.h
2 +++ b/drivers/net/wireless/ath/ath9k/hw.h
3 @@ -197,7 +197,6 @@ struct ath9k_hw_capabilities {
7 - u16 tx_triglevel_max;
11 --- a/drivers/net/wireless/ath/ath9k/xmit.c
12 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
13 @@ -2059,7 +2059,7 @@ static void ath_tx_rc_status(struct ath_
14 if (ieee80211_is_data(hdr->frame_control) &&
15 (ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN |
16 ATH9K_TX_DELIM_UNDERRUN)) &&
17 - ah->tx_trig_level >= sc->sc_ah->caps.tx_triglevel_max)
18 + ah->tx_trig_level >= sc->sc_ah->config.max_txtrig_level)
19 tx_info->status.rates[tx_rateindex].count =
22 --- a/drivers/net/wireless/ath/ath9k/hw.c
23 +++ b/drivers/net/wireless/ath/ath9k/hw.c
24 @@ -1889,11 +1889,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw
26 pCap->hw_caps &= ~ATH9K_HW_CAP_HT;
28 - if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
29 - pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
31 - pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
34 pCap->num_gpio_pins = AR9271_NUM_GPIO;
35 else if (AR_DEVID_7010(ah))