aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-ieee80211.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 8ec779aca4..a24f53b591 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -7650,7 +7650,7 @@ add_ff_action_block_ack(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int
}
static guint
-add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 code, guint start)
+add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 code)
{
guint32 oui;
guint8 subtype;
@@ -7659,6 +7659,8 @@ add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
guint8 frag;
gboolean more;
+ guint start = offset;
+
switch (code) {
case PA_EXT_CHANNEL_SWITCH_ANNOUNCEMENT:
offset += add_ff_extended_channel_switch_announcement(tree, tvb, pinfo, offset);
@@ -7736,7 +7738,7 @@ add_ff_action_public(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of
offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_CATEGORY_CODE);
code = tvb_get_guint8(tvb, offset);
offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_PA_ACTION_CODE);
- offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code, start);
+ offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code);
return offset - start;
}
@@ -7748,7 +7750,7 @@ add_ff_action_protected_public(proto_tree *tree, tvbuff_t *tvb, packet_info *pin
offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_CATEGORY_CODE);
code = tvb_get_guint8(tvb, offset);
offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_PPA_ACTION_CODE);
- offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code, start);
+ offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code);
return offset - start;
}