diff options
| author | Bill Meier <wmeier@newsguy.com> | 2015-07-29 18:48:14 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2015-07-29 23:13:37 +0000 |
| commit | e4f418ce7c39677311ac85dc1f45e52198cce16e (patch) | |
| tree | 5b092c0a46aa37565d39b354b0edd95a35781091 /epan/dissectors/packet-ieee80211.c | |
| parent | d6f59cd10f966cfbe7fce4146f314acd59c84bd2 (diff) | |
| download | wireshark-e4f418ce7c39677311ac85dc1f45e52198cce16e.tar.gz | |
[ieee80211] Don't call expert_...() under 'if (tree)'
Change-Id: Idcda58191ca664412ef874a69f40eb09a5b38234
Reviewed-on: https://code.wireshark.org/review/9820
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index fb902f6dab..0b9221b000 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -16676,15 +16676,12 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, hdr_len = roundup2(hdr_len, 4); /* Add the FC and duration/id to the current tree */ - if (tree) - { - ti = proto_tree_add_protocol_format (tree, proto_wlan, tvb, 0, hdr_len, + ti = proto_tree_add_protocol_format (tree, proto_wlan, tvb, 0, hdr_len, "IEEE 802.11 %s", fts_str); - hdr_tree = proto_item_add_subtree (ti, ett_80211); + hdr_tree = proto_item_add_subtree (ti, ett_80211); - dissect_frame_control(hdr_tree, tvb, wlan_broken_fc, 0, pinfo); - dissect_durid(hdr_tree, tvb, frame_type_subtype, 2); - } + dissect_frame_control(hdr_tree, tvb, wlan_broken_fc, 0, pinfo); + dissect_durid(hdr_tree, tvb, frame_type_subtype, 2); switch (phdr->fcs_len) { @@ -17008,7 +17005,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, { set_src_addr_cols(pinfo, tvb, offset, "TA"); - if (tree) + /* if (tree) */ { guint16 bar_control; guint8 block_ack_type; @@ -17118,7 +17115,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, { set_src_addr_cols(pinfo, tvb, offset, "TA"); - if (tree) + /* if (tree) */ { guint16 ba_control; guint8 block_ack_type; |