Commit 8db6e736 authored Aug 07, 2019 by John Crispin Committed by Johannes Berg Aug 21, 2019

mac80211: fix bad guard when reporting legacy rates

When reporting legacy rates inside the TX Radiotap header we need to split
the check between "uses tx_statua_ext" and "is legacy rate". Not doing so
would make the code drop into the !tx_status_ext path.

Fixes: 3d07ffca ("mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header")
Signed-off-by: John Crispin <john@phrozen.org>
Link: https://lore.kernel.org/r/20190807075949.32414-2-john@phrozen.org

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent dc649d64

net/mac80211/status.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -327,13 +327,13 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local,

		/* IEEE80211_RADIOTAP_RATE */

		if (status && status->rate && !(status->rate->flags &
		(RATE_INFO_FLAGS_MCS \|
		if (status && status->rate) {
		if (!(status->rate->flags & (RATE_INFO_FLAGS_MCS \|
		RATE_INFO_FLAGS_60G \|
		RATE_INFO_FLAGS_VHT_MCS \|
		RATE_INFO_FLAGS_HE_MCS)))
		legacy_rate = status->rate->legacy;
		else if (info->status.rates[0].idx >= 0 &&
		} else if (info->status.rates[0].idx >= 0 &&
		!(info->status.rates[0].flags & (IEEE80211_TX_RC_MCS \|
		IEEE80211_TX_RC_VHT_MCS)))
		legacy_rate =