diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-26 08:25:32 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-27 05:00:37 +0000 |
| commit | 10261d120283cb739118fa7178b4e911ed72de14 (patch) | |
| tree | 034d43a2eb1757d37cf9cc1453de9b815e0ad2bc /epan/dissectors/packet-bpdu.c | |
| parent | e2d5089cb9ad555bc0361768a5eaf24b3bd1379c (diff) | |
Remove manual setting of pinfo->current_proto.
Calling a protocol dissection function will properly set/restore pinfo->current_proto, so there's no need to duplicate it.
Change-Id: Ic2ec0b35fa4d46a98f3410bf238056425076e4a9
Reviewed-on: https://code.wireshark.org/review/12205
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bpdu.c')
| -rw-r--r-- | epan/dissectors/packet-bpdu.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 9c69eb08df..b3eb9468e5 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -248,9 +248,6 @@ static const char initial_sep[] = " ("; static const char cont_sep[] = ", "; static void -dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bpdu_pvst); - -static void dissect_bpdu_pvst_tlv(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb) { gboolean pvst_tlv_origvlan_present = FALSE; guint16 tlv_type, tlv_length; @@ -401,9 +398,6 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp call_dissector(gvrp_handle, tvb, pinfo, tree); return; } - - pinfo->current_proto = "GARP"; - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GARP"); /* Generic Attribute Registration Protocol */ |