diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-12-20 14:08:57 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-12-20 22:41:09 +0000 |
| commit | a8331a9274bbd8161a2fd0f0b98ce39b1aa4cae2 (patch) | |
| tree | f8dd6e4b0d2c54ca14baf69b988a37bd80b8dec3 /epan/dissectors | |
| parent | 69c0a10400b3371c84df7e6b4f5027751db7b46c (diff) | |
802.11: Use the pseudo-header PHY to determine whether it's DMG.
It's the responsibility of code that processes radio metadata (file
readers in libwiretap or dissectors in libwireshark) to set the PHY
correctly, even if it has to infer it from the frequency. The 802.11
dissector should just check the PHY.
Change-Id: Ie6aa73a062c7538cbe2e994fb6a6a2a1e9ac978d
Reviewed-on: https://code.wireshark.org/review/35533
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index f5ff59850b..9a0d2630df 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -23858,9 +23858,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, guint16 meshoff = 0; static wlan_hdr_t whdrs[4]; gboolean retransmitted; - gboolean isDMG = (phdr->has_frequency ? - IS_80211AD(phdr->frequency) : - FALSE); + gboolean isDMG = (phdr->phy == PHDR_802_11_PHY_11AD); encap_t encap_type; proto_tree *hdr_tree = NULL; |