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

Commit 97d3f458 authored by Gábor Stefanik's avatar Gábor Stefanik Committed by John W. Linville
Browse files

ath9k: Fix handling of retry count of NO_ACK frames 



Check for IEEE80211_TX_CTL_NO_ACK instead of is_multicast_ether_addr
when determining whether to use lowest rate without retries.

Signed-off-by: default avatarGábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 514d65c1

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

+5 −4
Original line number Diff line number Diff line
@@ -1568,12 +1568,13 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, 
	struct ath_rate_priv *ath_rc_priv = priv_sta;

	__le16 fc = hdr->frame_control;



	/* lowest rate for management and multicast/broadcast frames */

	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1) ||

	    !sta) {

	/* lowest rate for management and NO_ACK frames */

	if (!ieee80211_is_data(fc) ||

	    tx_info->flags & IEEE80211_TX_CTL_NO_ACK || !sta) {

		tx_info->control.rates[0].idx = rate_lowest_index(sband, sta);

		tx_info->control.rates[0].count =

			is_multicast_ether_addr(hdr->addr1) ? 1 : ATH_MGT_TXMAXTRY;

			(tx_info->flags & IEEE80211_TX_CTL_NO_ACK) ?

				1 : ATH_MGT_TXMAXTRY;

		return;

	}