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

Commit 311ab8e1 authored by Bob Copeland's avatar Bob Copeland Committed by Johannes Berg
Browse files

mac80211: fixup radiotap tx flags for RTS/CTS 



When using RTS/CTS, the CTS-to-Self bit in radiotap TX flags is
getting set instead of the RTS bit.  Set the correct one.

Reported-by: default avatarLarry Maxwell <larrymaxwell@agilemesh.com>
Signed-off-by: default avatarBob Copeland <bob@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 062f1d6d

net/mac80211/status.c

+2 −3
Original line number Diff line number Diff line
@@ -314,10 +314,9 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, 
	    !is_multicast_ether_addr(hdr->addr1))

		txflags |= IEEE80211_RADIOTAP_F_TX_FAIL;



	if ((info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) ||

	    (info->status.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT))

	if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)

		txflags |= IEEE80211_RADIOTAP_F_TX_CTS;

	else if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)

	if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)

		txflags |= IEEE80211_RADIOTAP_F_TX_RTS;



	put_unaligned_le16(txflags, pos);