summaryrefslogtreecommitdiff
path: root/wiretap/wtap.h
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap/wtap.h')
-rw-r--r--wiretap/wtap.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index c5d9db4c5c..957dc76c6b 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -760,20 +760,22 @@ struct ieee_802_11ad {
guint8 mcs; /* MCS index */
};
+union ieee_802_11_phy_info {
+ struct ieee_802_11_fhss info_11_fhss;
+ struct ieee_802_11b info_11b;
+ struct ieee_802_11a info_11a;
+ struct ieee_802_11g info_11g;
+ struct ieee_802_11n info_11n;
+ struct ieee_802_11ac info_11ac;
+ struct ieee_802_11ad info_11ad;
+};
+
struct ieee_802_11_phdr {
gint fcs_len; /* Number of bytes of FCS - -1 means "unknown" */
gboolean decrypted; /* TRUE if frame is decrypted even if "protected" bit is set */
gboolean datapad; /* TRUE if frame has padding between 802.11 header and payload */
guint phy; /* PHY type */
- union {
- struct ieee_802_11_fhss info_11_fhss;
- struct ieee_802_11b info_11b;
- struct ieee_802_11a info_11a;
- struct ieee_802_11g info_11g;
- struct ieee_802_11n info_11n;
- struct ieee_802_11ac info_11ac;
- struct ieee_802_11ad info_11ad;
- } phy_info;
+ union ieee_802_11_phy_info phy_info;
/* Which of this information is present? */
guint has_channel:1;