diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-17 19:08:13 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-18 02:08:38 +0000 |
| commit | ac96b2cebde5de03172dae89581d7980a776d9f4 (patch) | |
| tree | 32901ef61e16fa56cd76ab6ad7aecbaf876f3cda /epan/dissectors/packet-ieee80211-radiotap.c | |
| parent | d3c7d6ed41daee116249b1a2737714060e19dfe2 (diff) | |
The STBC subfield of the radiotap MCS field is a count, not a flag.
It's a 2-bit field that is the "number of STBC streams", according to
the radiotap Web site item for the MCS field:
http://www.radiotap.org/defined-fields/MCS
Correctly label both the FCS type and STBC stream count fields.
Change-Id: Ic49f6faec3335096c6bb8ce96ce0dec2f9342a37
Reviewed-on: https://code.wireshark.org/review/8971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee80211-radiotap.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index d875f9e9ea..179c650956 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -1186,7 +1186,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvb, offset + 1, 1, mcs_flags); } if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_STBC) { - proto_tree_add_boolean(mcs_tree, hf_radiotap_mcs_stbc, + proto_tree_add_uint(mcs_tree, hf_radiotap_mcs_stbc, tvb, offset + 1, 1, mcs_flags); } if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_MCS) { @@ -1972,14 +1972,14 @@ void proto_register_radiotap(void) "Format information present", HFILL}}, {&hf_radiotap_mcs_have_fec, - {"FEC", "radiotap.mcs.have_fec", + {"FEC type", "radiotap.mcs.have_fec", FT_BOOLEAN, 8, NULL, IEEE80211_RADIOTAP_MCS_HAVE_FEC, - "Forward error correction information present", HFILL}}, + "Forward error correction type information present", HFILL}}, {&hf_radiotap_mcs_have_stbc, - {"STBC", "radiotap.mcs.have_stbc", + {"STBC streams", "radiotap.mcs.have_stbc", FT_BOOLEAN, 8, NULL, IEEE80211_RADIOTAP_MCS_HAVE_STBC, - "Space Time Block Coding information present", HFILL}}, + "Space Time Block Coding streams information present", HFILL}}, {&hf_radiotap_mcs_have_index, {"MCS index", "radiotap.mcs.have_index", @@ -2002,14 +2002,14 @@ void proto_register_radiotap(void) NULL, HFILL}}, {&hf_radiotap_mcs_fec, - {"FEC", "radiotap.mcs.fec", + {"FEC type", "radiotap.mcs.fec", FT_UINT8, BASE_DEC, VALS(mcs_fec), IEEE80211_RADIOTAP_MCS_FEC_LDPC, - "forward error correction", HFILL}}, + "Forward error correction type", HFILL}}, {&hf_radiotap_mcs_stbc, - {"STBC", "radiotap.mcs.stbc", - FT_BOOLEAN, 8, TFS(&tfs_on_off), IEEE80211_RADIOTAP_MCS_STBC, - "Space Time Block Code", HFILL}}, + {"STBC streams", "radiotap.mcs.stbc", + FT_UINT8, BASE_DEC, NULL, IEEE80211_RADIOTAP_MCS_STBC_MASK, + "Number of Space Time Block Code streams", HFILL}}, {&hf_radiotap_mcs_index, {"MCS index", "radiotap.mcs.index", |