aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-radiotap-iter.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2011-01-27 17:45:45 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2011-01-27 17:45:45 +0000
commita5c879e5ef6f6bbc7aa60ce42011ef4b264270a5 (patch)
treef900398cbabfd306029de31ff5ab06bd423c4ebf /epan/dissectors/packet-radiotap-iter.c
parentf5ee014722ea937dc41f43dfc7f95ff7c08511c0 (diff)
From Johannes Berg via bug 5625:
The radiotap standard just adopted the new MCS field to display MCS information. The attached patch allows wireshark to parse that field. From me: Terminate value_strings. Move the IEEE80211_RADIOTAP_XCHANNEL definition to packet-radiotap-defs.h. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35684 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-radiotap-iter.c')
-rw-r--r--epan/dissectors/packet-radiotap-iter.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-radiotap-iter.c b/epan/dissectors/packet-radiotap-iter.c
index 036079edd5..edf22fe753 100644
--- a/epan/dissectors/packet-radiotap-iter.c
+++ b/epan/dissectors/packet-radiotap-iter.c
@@ -48,7 +48,9 @@ static const struct radiotap_align_size rtap_namespace_sizes[] = {
/* [IEEE80211_RADIOTAP_RX_FLAGS] = 14 */ { 2, 2 },
/* [IEEE80211_RADIOTAP_TX_FLAGS] = 15 */ { 2, 2 },
/* [IEEE80211_RADIOTAP_RTS_RETRIES] = 16 */ { 1, 1 },
- /* [IEEE80211_RADIOTAP_DATA_RETRIES] = 17 */ { 1, 1 }
+ /* [IEEE80211_RADIOTAP_DATA_RETRIES] = 17 */ { 1, 1 },
+ /* [IEEE80211_RADIOTAP_XCHANNEL] = 18 */ { 0, 0 }, /* Unofficial, used by FreeBSD */
+ /* [IEEE80211_RADIOTAP_MCS] = 19 */ { 1, 3 }
/*
* add more here as they are defined in
* include/net/ieee80211_radiotap.h