diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-22 11:27:41 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2018-02-22 11:41:57 +0000 |
commit | e57ecf4acd280e972449558e58d57307338bca86 (patch) | |
tree | 7cf2e51291ebc325c081643e2c1753d5bd8b38db | |
parent | e510ceed0563a5b37481339beb1a8cb61809d164 (diff) |
IEEE 802.11: fix build with gcc7
Remove an unused hf entry.
Remove an unused true_false value string.
Fix an indentation so that the compiler does not think backets are missing.
Change-Id: Id6c0597b68674fd17f750379f941698d72b0cbba
Reviewed-on: https://code.wireshark.org/review/25986
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index b8f2fb93ef..93f300e873 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -3669,7 +3669,6 @@ static int hf_ieee80211_block_ack_control_type = -1; static int hf_ieee80211_block_ack_control_reserved = -1; static int hf_ieee80211_block_ack_control_tid_info = -1; -static int hf_ieee80211_block_ack_multi_tid_info = -1; static int hf_ieee80211_block_ack_multi_tid_reserved = -1; static int hf_ieee80211_block_ack_multi_tid_value = -1; static int hf_ieee80211_block_ack_bitmap = -1; @@ -19191,11 +19190,6 @@ static const value_string block_ack_type_vals[] = { { 0, NULL } }; -static const true_false_string control_ack_policy_tfs = { - "No Acknowledgement", - "Normal Acknowledgement" -}; - static int dissect_ieee80211_block_ack_details(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean isDMG, gboolean is_req) @@ -19821,7 +19815,7 @@ dissect_ieee80211_vht_ndp_annc(tvbuff_t *tvb, packet_info *pinfo _U_, else proto_tree_add_item(sta_info_tree, hf_ieee80211_vht_ndp_annc_sta_info_reserved, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 2; + offset += 2; } return offset; @@ -22527,11 +22521,6 @@ proto_register_ieee80211(void) FT_UINT16, BASE_HEX, NULL, 0xf000, "Traffic Identifier (TID) for which a Basic BlockAck frame is requested", HFILL }}, - {&hf_ieee80211_block_ack_multi_tid_info, - {"Traffic Identifier (TID) Info", "wlan.ba.mtid.tid", - FT_UINT8, BASE_DEC, 0, 0, - NULL, HFILL }}, - {&hf_ieee80211_block_ack_multi_tid_reserved, {"Reserved", "wlan.bar.mtid.tidinfo.reserved", FT_UINT16, BASE_HEX, 0, 0x0fff, |