diff options
| author | Simon Barber <simon.barber@meraki.net> | 2016-01-06 17:23:00 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-30 13:22:50 +0000 |
| commit | bb83fe45519eb280e6545ad69868e4e7f5fbef93 (patch) | |
| tree | 997f88afebd94c1cd60ea22b28b1341e324b2c52 /wiretap | |
| parent | 7f2c6e13001bed11ae113b0aca47e562735d6e26 (diff) | |
| download | wireshark-bb83fe45519eb280e6545ad69868e4e7f5fbef93.tar.gz | |
packet-ieee80211-radio.c: Minor refactor and whitespace cleanup
Change-Id: Idad8f7eeed968eeed9f553fef98d58453f328afb
Reviewed-on: https://code.wireshark.org/review/21421
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap.h | 20 |
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; |