Commit 48613ece authored by Johannes Berg's avatar Johannes Berg
Browse files

wireless: add radiotap A-MPDU status field 



Define the A-MPDU status field in radiotap, also
update the radiotap parser for it and the MCS field
that was apparently missed last time.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e687f61e

include/net/ieee80211_radiotap.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -183,6 +183,9 @@ struct ieee80211_radiotap_header { 
 *     Contains a bitmap of known fields/flags, the flags, and

 *     Contains a bitmap of known fields/flags, the flags, and

 *     the MCS index.

 *     the MCS index.

 *

 *

 * IEEE80211_RADIOTAP_AMPDU_STATUS	u32, u16, u8, u8	unitless

 *

 *	Contains the AMPDU information for the subframe.

 */

 */

enum ieee80211_radiotap_type {

enum ieee80211_radiotap_type {

	IEEE80211_RADIOTAP_TSFT = 0,

	IEEE80211_RADIOTAP_TSFT = 0,
@@ -205,6 +208,7 @@ enum ieee80211_radiotap_type { 
	IEEE80211_RADIOTAP_DATA_RETRIES = 17,

	IEEE80211_RADIOTAP_DATA_RETRIES = 17,





	IEEE80211_RADIOTAP_MCS = 19,

	IEEE80211_RADIOTAP_MCS = 19,

	IEEE80211_RADIOTAP_AMPDU_STATUS = 20,





	/* valid in every it_present bitmap, even vendor namespaces */

	/* valid in every it_present bitmap, even vendor namespaces */

	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,

	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
@@ -270,6 +274,13 @@ enum ieee80211_radiotap_type { 
#define IEEE80211_RADIOTAP_MCS_FMT_GF		0x08

#define IEEE80211_RADIOTAP_MCS_FMT_GF		0x08

#define IEEE80211_RADIOTAP_MCS_FEC_LDPC		0x10

#define IEEE80211_RADIOTAP_MCS_FEC_LDPC		0x10





/* For IEEE80211_RADIOTAP_AMPDU_STATUS */

#define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN		0x0001

#define IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN		0x0002

#define IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN		0x0004

#define IEEE80211_RADIOTAP_AMPDU_IS_LAST		0x0008

#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR		0x0010

#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN	0x0020





/* helpers */

/* helpers */

static inline int ieee80211_get_radiotap_len(unsigned char *data)

static inline int ieee80211_get_radiotap_len(unsigned char *data)

net/wireless/radiotap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,8 @@ static const struct radiotap_align_size rtap_namespace_sizes[] = { 
	[IEEE80211_RADIOTAP_TX_FLAGS] = { .align = 2, .size = 2, },

	[IEEE80211_RADIOTAP_TX_FLAGS] = { .align = 2, .size = 2, },

	[IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, },

	[IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, },

	[IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },

	[IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },

	[IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },

	[IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },

	/*

	/*

	 * add more here as they are defined in radiotap.h

	 * add more here as they are defined in radiotap.h

	 */

	 */