aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211-radiotap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-15 02:57:15 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-15 10:58:06 +0000
commit143ce9471381744ab333d397fc964cc522e32ec3 (patch)
tree80fcca6c517374c3e6db48a1ec23528dbdf8281f /epan/dissectors/packet-ieee80211-radiotap.c
parentec863197d9bd36a08087107e377e9fe653e628cc (diff)
Correctly set the "short GI" flag in the generic radio information structure.
For 802.11n, if the GI length is present in the MCS field and is "short GI", "gi_length" is equal to 1, not to 0, so set the "short GI" flag in the generic radio information to "gi_length". Bug: 12123 Change-Id: Ica2c5794698a643a6393f0468cdbfe025aa90074 Reviewed-on: https://code.wireshark.org/review/13950 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 4668b6e61e..8145e149ab 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -1373,7 +1373,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u
gi_length = (mcs_flags & IEEE80211_RADIOTAP_MCS_SGI) ?
1 : 0;
phdr.phy_info.info_11n.has_short_gi = TRUE;
- phdr.phy_info.info_11n.short_gi = (gi_length == 0);
+ phdr.phy_info.info_11n.short_gi = gi_length;
} else {
gi_length = 0;
can_calculate_rate = FALSE; /* no GI width */