Skip to contentSkip to conversation

a-MPDU extension

RFC New Johannes Berg 1 participant 1 message Dec 19, 2010

lore
Share & tools
lore
#0 lore raw

RFC 1/1 a-MPDU extension

This isn't really an RFA yet since I haven't really talked to anyone about it ...

Since I removed the aMPDU information from the MCS proposal, we should add it back. I think it makes more sense to keep it separate anyway.

What I'm proposing is a new a-MPDU status field that is a simple one-byte field, containing:

| mask | meaning
----------------------

| 0x80 | index valid
| 0x40 | reserved
| 0x3f | index in a-MPDU

The presence of the field indicates that the frame was part of an aggregate, and if known, the index in the aggregate may be given by setting the 0x80 bit and the lower bits appropriately.

Thoughts? Is there anything this doesn't cover? I have a wireshark implementation (attached) but no capture implementation yet since I'm still looking at some bigger changes to push this information through the Linux wifi stack.

johannes

---
 epan/dissectors/packet-radiotap-defs.h |    9 ++++++
 epan/dissectors/packet-radiotap-iter.c |    3 +-
 epan/dissectors/packet-radiotap.c      |   43 +++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
epan/dissectors/packet-radiotap-defs.h +9 -0
@@ -182,6 +182,11 @@ struct ieee80211_radiotap_header {
  *     Contains a bitmap of known fields/flags, the flags, and
  *     the MCS index.
  *
+ * IEEE80211_RADIOTAP_AMPDU		u8		unitless
+ *
+ *     If present, frame was part of an aMPDU, if the highest
+ *     bit of the u8 is set the lowest 6 bits of it contain
+ *     the index of this frame in the aMPDU.
  */
 enum ieee80211_radiotap_type {
 	IEEE80211_RADIOTAP_TSFT = 0,
@@ -204,6 +209,7 @@ enum ieee80211_radiotap_type {
 	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
 
 	IEEE80211_RADIOTAP_MCS = 19,
+	IEEE80211_RADIOTAP_AMPDU = 20,
 
 	/* valid in every it_present bitmap, even vendor namespaces */
 	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
@@ -268,4 +274,7 @@ enum ieee80211_radiotap_type {
 #define IEEE80211_RADIOTAP_MCS_FMT_GF		0x08
 #define IEEE80211_RADIOTAP_MCS_FEC_LDPC		0x10
 
+#define IEEE80211_RADIOTAP_AMPDU_IDX_VALID	0x80
+#define IEEE80211_RADIOTAP_AMPDU_IDX_MASK	0x3f
+
 #endif				/* IEEE80211_RADIOTAP_H */
epan/dissectors/packet-radiotap-iter.c +2 -1
@@ -50,7 +50,8 @@ static const struct radiotap_align_size
 	/* [IEEE80211_RADIOTAP_RTS_RETRIES] = 16 */		{ 1, 1 },
 	/* [IEEE80211_RADIOTAP_DATA_RETRIES] = 17 */		{ 1, 1 },
 	/* currently undefined = 18 */				{ 0, 0 },
-	/* [IEEE80211_RADIOTAP_MCS] = 19 */			{ 1, 3 }
+	/* [IEEE80211_RADIOTAP_MCS] = 19 */			{ 1, 3 },
+	/* [IEEE80211_RADIOTAP_AMPDU] = 20 */			{ 1, 1 }
 	/*
 	 * add more here as they are defined in
 	 * include/net/ieee80211_radiotap.h
epan/dissectors/packet-radiotap.c +43 -0

85 lines not on this page · raw message