aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-10-25 21:03:36 -0400
committerMichael Mann <mmann78@netscape.net>2015-10-26 11:28:41 +0000
commit7f591e4c07e10168f06a6a0dbb04bc66613836a7 (patch)
treea064d584a8e7b70bcdee795c96c5efe56fa937c8 /epan/dissectors/packet-ieee80211.c
parente2203f5aed1eef900c7568b6d14f3e303e271b7c (diff)
Clean up more unnecessary use of the 'volatile' key word.
Change-Id: I3e72fddc6ed380780d7e2e1c8df87e580138188d Reviewed-on: https://code.wireshark.org/review/11271 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index d077b42b73..738f8f31d1 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -13316,7 +13316,7 @@ dissect_neighbor_report(tvbuff_t *tvb, packet_info *pinfo,
guint32 sub_tag_length;
proto_item *parent_item;
proto_tree *bssid_info_subtree, *bssid_info_cap_subtree, *sub_tag_tree;
- tvbuff_t *volatile sub_tag_tvb = NULL;
+ tvbuff_t *sub_tag_tvb = NULL;
if (tag_len < 13) {
expert_add_info_format(pinfo, ti_len, &ei_ieee80211_tag_length,
@@ -16470,10 +16470,10 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
IS_80211AD(phdr->frequency) :
FALSE);
- volatile encap_t encap_type;
- proto_tree *volatile hdr_tree = NULL;
- tvbuff_t *volatile next_tvb = NULL;
- wlan_hdr_t *volatile whdr;
+ encap_t encap_type;
+ proto_tree *hdr_tree = NULL;
+ tvbuff_t *next_tvb = NULL;
+ wlan_hdr_t *whdr;
AIRPDCAP_KEY_ITEM used_key;