aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-epl.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:59:51 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 07:59:51 +0000
commit6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch)
treeef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-epl.c
parent0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff)
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-epl.c')
-rw-r--r--epan/dissectors/packet-epl.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index f326d877ba..dd34ec4020 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -253,18 +253,12 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Make entries in Protocol column and Info column on summary display */
if (pinfo->ethertype == ETHERTYPE_EPL_V2)
{
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL");
udpencap = FALSE;
}
else
{ /* guess that this is an EPL frame encapsulated into an UDP datagram */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL/UDP");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL/UDP");
udpencap = TRUE;
}