Commit adb5066a authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: do not apply the 2.4 ghz ack timeout workaround to cts 



It is only used to workaround interoperability issues related to longer
delays in receiving the block ack, so it is not necessary to apply it
to the CTS exchange.
Should improve throughput slightly, especially when there are lots
of retransmissions.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2cca397f

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -960,7 +960,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) 
	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_common *common = ath9k_hw_common(ah);

	struct ieee80211_conf *conf = &common->hw->conf;

	struct ieee80211_conf *conf = &common->hw->conf;

	const struct ath9k_channel *chan = ah->curchan;

	const struct ath9k_channel *chan = ah->curchan;

	int acktimeout;

	int acktimeout, ctstimeout;

	int slottime;

	int slottime;

	int sifstime;

	int sifstime;

	int rx_lat = 0, tx_lat = 0, eifs = 0;

	int rx_lat = 0, tx_lat = 0, eifs = 0;
@@ -1017,6 +1017,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) 




	/* As defined by IEEE 802.11-2007 17.3.8.6 */

	/* As defined by IEEE 802.11-2007 17.3.8.6 */

	acktimeout = slottime + sifstime + 3 * ah->coverage_class;

	acktimeout = slottime + sifstime + 3 * ah->coverage_class;

	ctstimeout = acktimeout;





	/*

	/*

	 * Workaround for early ACK timeouts, add an offset to match the

	 * Workaround for early ACK timeouts, add an offset to match the
@@ -1031,7 +1032,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah) 
	ath9k_hw_set_sifs_time(ah, sifstime);

	ath9k_hw_set_sifs_time(ah, sifstime);

	ath9k_hw_setslottime(ah, slottime);

	ath9k_hw_setslottime(ah, slottime);

	ath9k_hw_set_ack_timeout(ah, acktimeout);

	ath9k_hw_set_ack_timeout(ah, acktimeout);

	ath9k_hw_set_cts_timeout(ah, acktimeout);

	ath9k_hw_set_cts_timeout(ah, ctstimeout);

	if (ah->globaltxtimeout != (u32) -1)

	if (ah->globaltxtimeout != (u32) -1)

		ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout);

		ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout);

CRA Git | Maintained and supported by SUSTech CRA and CCSE