36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||
|
|
@@ -197,7 +197,6 @@ struct ath9k_hw_capabilities {
|
||
|
|
u8 rx_chainmask;
|
||
|
|
u8 max_txchains;
|
||
|
|
u8 max_rxchains;
|
||
|
|
- u16 tx_triglevel_max;
|
||
|
|
u8 num_gpio_pins;
|
||
|
|
u8 rx_hp_qdepth;
|
||
|
|
u8 rx_lp_qdepth;
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
||
|
|
@@ -2059,7 +2059,7 @@ static void ath_tx_rc_status(struct ath_
|
||
|
|
if (ieee80211_is_data(hdr->frame_control) &&
|
||
|
|
(ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN |
|
||
|
|
ATH9K_TX_DELIM_UNDERRUN)) &&
|
||
|
|
- ah->tx_trig_level >= sc->sc_ah->caps.tx_triglevel_max)
|
||
|
|
+ ah->tx_trig_level >= sc->sc_ah->config.max_txtrig_level)
|
||
|
|
tx_info->status.rates[tx_rateindex].count =
|
||
|
|
hw->max_rate_tries;
|
||
|
|
}
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||
|
|
@@ -1889,11 +1889,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw
|
||
|
|
else
|
||
|
|
pCap->hw_caps &= ~ATH9K_HW_CAP_HT;
|
||
|
|
|
||
|
|
- if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
|
||
|
|
- pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
|
||
|
|
- else
|
||
|
|
- pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
|
||
|
|
-
|
||
|
|
if (AR_SREV_9271(ah))
|
||
|
|
pCap->num_gpio_pins = AR9271_NUM_GPIO;
|
||
|
|
else if (AR_DEVID_7010(ah))
|