Wireshark · Wireshark-dev: [Wireshark-dev] Patch: Prepare for some cleanups of 802.11ad

[Richard Sharpe <realrichardsharpe@xxxxxxxxx>]

Hi folks,

As part of fixing some problems in the 802.11ad dissector that I am
aware of I want to define some constants and a convenience macro in
wiretap/wtap.h.

Here are the first changes. If anyone has any criticisms let me know.
I will likely push this to Gerrit later in the weekend.

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 8de0c30..11d460d 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -571,6 +571,7 @@ struct p2p_phdr {
 #define PHDR_802_11_PHY_11G            6 /* 802.11g */
 #define PHDR_802_11_PHY_11N            7 /* 802.11n */
 #define PHDR_802_11_PHY_11AC           8 /* 802.11ac */
+#define PHDR_802_11_PHY_11AD           9 /* 802.11ad */

 /*
  * PHY-specific information.
@@ -718,6 +719,16 @@ struct ieee_802_11n {
 #define PHDR_802_11_BANDWIDTH_20UUU    25 /* ???, 160 MHz */

 /*
+ * Min and Max frequencies for 802.11ad and a macro for checking for 802.11ad.
+ */
+
+#define PHDR_802_11AD_MIN_FREQUENCY    57000
+#define PHDR_802_11AD_MAX_FREQUENCY    66000
+
+#define IS_80211AD(frequency) (((frequency) >= PHDR_802_11AD_MIN_FREQUENCY) &&\
+                               ((frequency) <= PHDR_802_11AD_MAX_FREQUENCY))
+
+/*
  * 802.11ac.
  */
 struct ieee_802_11ac {


-- 
Regards,
Richard Sharpe
(何以解憂？唯有杜康。--曹操)