Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83860c59 authored Mar 23, 2011 by Felix Fietkau Committed by John W. Linville Mar 30, 2011

ath9k_hw: remove pCap->tx_triglevel_max



It has the same purpose (and value) as ah->config.max_txtrig_level

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 340d0ea7

drivers/net/wireless/ath/ath9k/hw.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1880,11 +1880,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
	else		else
	pCap->hw_caps &= ~ATH9K_HW_CAP_HT;		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))		if (AR_SREV_9271(ah))
	pCap->num_gpio_pins = AR9271_NUM_GPIO;		pCap->num_gpio_pins = AR9271_NUM_GPIO;
	else if (AR_DEVID_7010(ah))		else if (AR_DEVID_7010(ah))

drivers/net/wireless/ath/ath9k/hw.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -197,7 +197,6 @@ struct ath9k_hw_capabilities {
	u8 rx_chainmask;		u8 rx_chainmask;
	u8 max_txchains;		u8 max_txchains;
	u8 max_rxchains;		u8 max_rxchains;
	u16 tx_triglevel_max;
	u8 num_gpio_pins;		u8 num_gpio_pins;
	u8 rx_hp_qdepth;		u8 rx_hp_qdepth;
	u8 rx_lp_qdepth;		u8 rx_lp_qdepth;

drivers/net/wireless/ath/ath9k/xmit.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1980,7 +1980,7 @@ static void ath_tx_rc_status(struct ath_softc sc, struct ath_buf bf,
	if (ieee80211_is_data(hdr->frame_control) &&		if (ieee80211_is_data(hdr->frame_control) &&
	(ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN \|		(ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN \|
	ATH9K_TX_DELIM_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 =		tx_info->status.rates[tx_rateindex].count =
	hw->max_rate_tries;		hw->max_rate_tries;
	}		}