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

Commit 63c361f5 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

mac80211: propagate STBC / LDPC flags to radiotap 



This capabilities weren't propagated to the radiotap header.
We don't set here the VHT_KNOWN / MCS_HAVE flag because not
all the low level drivers will know how to properly flag
the frames, hence the low level driver will be in charge
of setting IEEE80211_RADIOTAP_MCS_HAVE_FEC,
IEEE80211_RADIOTAP_MCS_HAVE_STBC and / or
IEEE80211_RADIOTAP_VHT_KNOWN_STBC according to its
capabilities.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1b8d242a

include/net/ieee80211_radiotap.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -316,6 +316,10 @@ enum ieee80211_radiotap_type { 
#define IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM		0x10

#define IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM		0x10

#define IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED			0x20

#define IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED			0x20





#define IEEE80211_RADIOTAP_CODING_LDPC_USER0			0x01

#define IEEE80211_RADIOTAP_CODING_LDPC_USER1			0x02

#define IEEE80211_RADIOTAP_CODING_LDPC_USER2			0x04

#define IEEE80211_RADIOTAP_CODING_LDPC_USER3			0x08





/* helpers */

/* helpers */

static inline int ieee80211_get_radiotap_len(unsigned char *data)

static inline int ieee80211_get_radiotap_len(unsigned char *data)

include/net/mac80211.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -827,6 +827,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) 
 *	on this subframe

 *	on this subframe

 * @RX_FLAG_AMPDU_DELIM_CRC_KNOWN: The delimiter CRC field is known (the CRC

 * @RX_FLAG_AMPDU_DELIM_CRC_KNOWN: The delimiter CRC field is known (the CRC

 *	is stored in the @ampdu_delimiter_crc field)

 *	is stored in the @ampdu_delimiter_crc field)

 * @RX_FLAG_LDPC: LDPC was used

 * @RX_FLAG_STBC_MASK: STBC 2 bit bitmask. 1 - Nss=1, 2 - Nss=2, 3 - Nss=3

 * @RX_FLAG_STBC_MASK: STBC 2 bit bitmask. 1 - Nss=1, 2 - Nss=2, 3 - Nss=3

 * @RX_FLAG_10MHZ: 10 MHz (half channel) was used

 * @RX_FLAG_10MHZ: 10 MHz (half channel) was used

 * @RX_FLAG_5MHZ: 5 MHz (quarter channel) was used

 * @RX_FLAG_5MHZ: 5 MHz (quarter channel) was used
@@ -863,6 +864,7 @@ enum mac80211_rx_flags { 
	RX_FLAG_AMPDU_DELIM_CRC_KNOWN	= BIT(20),

	RX_FLAG_AMPDU_DELIM_CRC_KNOWN	= BIT(20),

	RX_FLAG_MACTIME_END		= BIT(21),

	RX_FLAG_MACTIME_END		= BIT(21),

	RX_FLAG_VHT			= BIT(22),

	RX_FLAG_VHT			= BIT(22),

	RX_FLAG_LDPC			= BIT(23),

	RX_FLAG_STBC_MASK		= BIT(26) | BIT(27),

	RX_FLAG_STBC_MASK		= BIT(26) | BIT(27),

	RX_FLAG_10MHZ			= BIT(28),

	RX_FLAG_10MHZ			= BIT(28),

	RX_FLAG_5MHZ			= BIT(29),

	RX_FLAG_5MHZ			= BIT(29),

net/mac80211/rx.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -279,6 +279,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, 
			*pos |= IEEE80211_RADIOTAP_MCS_BW_40;

			*pos |= IEEE80211_RADIOTAP_MCS_BW_40;

		if (status->flag & RX_FLAG_HT_GF)

		if (status->flag & RX_FLAG_HT_GF)

			*pos |= IEEE80211_RADIOTAP_MCS_FMT_GF;

			*pos |= IEEE80211_RADIOTAP_MCS_FMT_GF;

		if (status->flag & RX_FLAG_LDPC)

			*pos |= IEEE80211_RADIOTAP_MCS_FEC_LDPC;

		stbc = (status->flag & RX_FLAG_STBC_MASK) >> RX_FLAG_STBC_SHIFT;

		stbc = (status->flag & RX_FLAG_STBC_MASK) >> RX_FLAG_STBC_SHIFT;

		*pos |= stbc << IEEE80211_RADIOTAP_MCS_STBC_SHIFT;

		*pos |= stbc << IEEE80211_RADIOTAP_MCS_STBC_SHIFT;

		pos++;

		pos++;
@@ -328,6 +330,9 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, 
		/* flags */

		/* flags */

		if (status->flag & RX_FLAG_SHORT_GI)

		if (status->flag & RX_FLAG_SHORT_GI)

			*pos |= IEEE80211_RADIOTAP_VHT_FLAG_SGI;

			*pos |= IEEE80211_RADIOTAP_VHT_FLAG_SGI;

		/* in VHT, STBC is binary */

		if (status->flag & RX_FLAG_STBC_MASK)

			*pos |= IEEE80211_RADIOTAP_VHT_FLAG_STBC;

		pos++;

		pos++;

		/* bandwidth */

		/* bandwidth */

		if (status->vht_flag & RX_VHT_FLAG_80MHZ)

		if (status->vht_flag & RX_VHT_FLAG_80MHZ)
@@ -344,6 +349,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, 
		*pos = (status->rate_idx << 4) | status->vht_nss;

		*pos = (status->rate_idx << 4) | status->vht_nss;

		pos += 4;

		pos += 4;

		/* coding field */

		/* coding field */

		if (status->flag & RX_FLAG_LDPC)

			*pos |= IEEE80211_RADIOTAP_CODING_LDPC_USER0;

		pos++;

		pos++;

		/* group ID */

		/* group ID */

		pos++;

		pos++;