osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

There's a macro to test for 802.11ad frequencies; use it. 

The range doesn't start at 60 GHz, it starts at 57 GHz; this fixes that,
and leaves it open to future fixes.

Change-Id: I51d7188f50479bf542babe0f6677638e8a683314
Reviewed-on: https://code.wireshark.org/review/35524
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2019-12-20 11:33:39 -08:00
parent 2925fb0850
commit e2fc0e4806
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-ieee80211-radiotap.c
View File

@ -1725,10 +1725,10 @@ dissect_radiotap_channel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
/*
* XXX - special-case 11ad; there's no field to explicitly indicate
* an 11ad packet. Anything with a frequency >= 60 GHz is treated
* as 11ad.
* an 11ad packet. Anything with a frequency in the 802.11ad range
* is treated as 11ad.
*/
if (freq >= 60000)
if (IS_80211AD(freq))
phdr->phy = PHDR_802_11_PHY_11AD;
if (tree) {
@ -1981,10 +1981,10 @@ dissect_radiotap_xchannel(tvbuff_t *tvb, packet_info *pinfo _U_,
/*
* XXX - special-case 11ad; there's no field to explicitly
* indicate an 11ad packet. Anything with a frequency >=
* 60 GHz is treated as 11ad.
* indicate an 11ad packet. Anything with a frequency in
* the 802.11ad range is treated as 11ad.
*/
if (freq >= 60000)
if (IS_80211AD(freq))
phdr->phy = PHDR_802_11_PHY_11AD;
}
phdr->has_channel = TRUE;