aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fr.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-fr.c')
-rw-r--r--epan/dissectors/packet-fr.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 9659b8836f..a44097f344 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -653,16 +653,15 @@ static void
dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree)
{
- proto_item *ti = NULL;
- proto_tree *fr_tree = NULL;
+ proto_item *ti;
+ proto_tree *fr_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR");
col_clear(pinfo->cinfo, COL_INFO);
- if (tree) {
- ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay");
- fr_tree = proto_item_add_subtree(ti, ett_fr);
- }
+ ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay");
+ fr_tree = proto_item_add_subtree(ti, ett_fr);
+
dissect_fr_nlpid(tvb, 0, pinfo, tree, ti, fr_tree, XDLC_U);
}