aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mpls.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 07:59:51 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 07:59:51 +0000
commit7a1740736d1aca5c3f0e07951327d24056237c5c (patch)
treeef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-mpls.c
parentb2e9a22ec53becba2c23777ffee4ff375d135698 (diff)
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29345 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
-rw-r--r--epan/dissectors/packet-mpls.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 6d77b1e803..308472b656 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -709,13 +709,9 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *ti;
tvbuff_t *next_tvb;
- if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
- col_set_str(pinfo->cinfo,COL_PROTOCOL, "MPLS");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPLS");
- if (check_col(pinfo->cinfo,COL_INFO)) {
- col_set_str(pinfo->cinfo,COL_INFO,"MPLS Label Switched Packet");
- }
+ col_set_str(pinfo->cinfo, COL_INFO, "MPLS Label Switched Packet");
/* Start Decoding Here. */
while (tvb_reported_length_remaining(tvb, offset) > 0) {