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

Commit b4be21f8 authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

ath9k: fix transmitting to stations in dynamic SMPS mode 



commit 3b9ea7206d7e1fdd7419cbd10badd3b2c80d04b4 upstream.

When transmitting to a receiver in dynamic SMPS mode, all transmissions that
use multiple spatial streams need to be sent using CTS-to-self or RTS/CTS to
give the receiver's extra chains some time to wake up.
This fixes the tx rate getting stuck at <= MCS7 for some clients, especially
Intel ones, which make aggressive use of SMPS.

Cc: stable@vger.kernel.org
Reported-by: default avatarMartin Kennedy <hurricos@gmail.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210214184911.96702-1-nbd@nbd.name


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a44d6eed

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

+2 −1
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ struct ath_frame_info { 
	s8 txq;

	u8 keyix;

	u8 rtscts_rate;

	u8 retries : 7;

	u8 retries : 6;

	u8 dyn_smps : 1;

	u8 baw_tracked : 1;

	u8 tx_power;

	enum ath9k_key_type keytype:2;

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

+6 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,11 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, 
				 is_40, is_sgi, is_sp);

			if (rix < 8 && (tx_info->flags & IEEE80211_TX_CTL_STBC))

				info->rates[i].RateFlags |= ATH9K_RATESERIES_STBC;

			if (rix >= 8 && fi->dyn_smps) {

				info->rates[i].RateFlags |=

					ATH9K_RATESERIES_RTS_CTS;

				info->flags |= ATH9K_TXDESC_CTSENA;

			}



			info->txpower[i] = ath_get_rate_txpower(sc, bf, rix,

								is_40, false);
@@ -2158,6 +2163,7 @@ static void setup_frame_info(struct ieee80211_hw *hw, 
		fi->keyix = an->ps_key;

	else

		fi->keyix = ATH9K_TXKEYIX_INVALID;

	fi->dyn_smps = sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC;

	fi->keytype = keytype;

	fi->framelen = framelen;

	fi->tx_power = txpower;