aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-chdlc.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 06:26:46 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 06:26:46 +0000
commite971354a546be5efc284c72e49689a2e337bc198 (patch)
tree13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-chdlc.c
parentfc067ab9104d12f3683c8f112250b8523260b77f (diff)
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'epan/dissectors/packet-chdlc.c')
-rw-r--r--epan/dissectors/packet-chdlc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 461333693d..1507305f4e 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -163,8 +163,7 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 addr;
guint16 proto;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
@@ -278,8 +277,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint32 mysequence;
guint32 yoursequence;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);