diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-01-05 21:28:58 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-06 03:38:17 +0000 |
| commit | cea1063af1aaa66f430d34410252693b19c364d3 (patch) | |
| tree | 88beb6ae078bf4e808ac1c93d1262951b4f7e106 | |
| parent | 3871df544a7ad16a6e418153e893f0caeb91f142 (diff) | |
802.11(ad): add reserved fields for Beam Forming
Change-Id: I486c883b27059eb55e9fe11fcc372fc31c1e56ca
Ping-Bug: 13244
Reviewed-on: https://code.wireshark.org/review/19560
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 2dbe25480e..95f47fd344 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4553,8 +4553,10 @@ static int hf_ieee80211_ff_bf_is_init = -1; static int hf_ieee80211_ff_bf_is_resp = -1; static int hf_ieee80211_ff_bf_num_sectors = -1; static int hf_ieee80211_ff_bf_num_rx_dmg_ants = -1; +static int hf_ieee80211_ff_bf_b12b15 = -1; static int hf_ieee80211_ff_bf_rxss_len = -1; static int hf_ieee80211_ff_bf_rxss_rate = -1; +static int hf_ieee80211_ff_bf_b10b15 = -1; static int hf_ieee80211_addr_nav_da = -1; static int hf_ieee80211_addr_nav_sa = -1; static int hf_ieee80211_ff_sswf = -1; @@ -8555,9 +8557,11 @@ add_ff_beamforming_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, if((isInit==TRUE) && (isResp==TRUE) && isGrant) { proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_num_sectors, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_num_rx_dmg_ants, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_b12b15, tvb, offset, 2, ENC_LITTLE_ENDIAN); } else { proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_rxss_len, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_rxss_rate, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_b10b15, tvb, offset, 2, ENC_LITTLE_ENDIAN); } return 2; } @@ -19796,6 +19800,11 @@ proto_register_ieee80211(void) FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL }}, + {&hf_ieee80211_ff_bf_b10b15, + {"Reserved (B10-B15)", "wlan.bf.reserved", + FT_UINT16, BASE_DEC, NULL, 0xFC00, + NULL, HFILL }}, + {&hf_ieee80211_ff_bf_num_sectors, {"Beam Forming Total Number of Sectors", "wlan.bf.num_sectors", FT_UINT16, BASE_DEC, NULL, 0x03f8, @@ -19806,6 +19815,11 @@ proto_register_ieee80211(void) FT_UINT16, BASE_DEC, NULL, 0x0c00, NULL, HFILL }}, + {&hf_ieee80211_ff_bf_b12b15, + {"Reserved (B12-B15)", "wlan.bf.reserved", + FT_UINT16, BASE_DEC, NULL, 0xF000, + NULL, HFILL }}, + {&hf_ieee80211_addr_nav_da, {"Destination address of STA that caused NAV update", "wlan.nav_da", FT_ETHER, BASE_NONE, NULL, 0, |