aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pppoe.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 08:14:59 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-09 08:14:59 +0000
commitac463d2697d3beb50fd24bbf48f818724f5220f6 (patch)
treee77267cdd463c269c8fb7bbefda18517ed363cbb /epan/dissectors/packet-pppoe.c
parent6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (diff)
Don't guard col_clear with col_check
svn path=/trunk/; revision=29346
Diffstat (limited to 'epan/dissectors/packet-pppoe.c')
-rw-r--r--epan/dissectors/packet-pppoe.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index b161a80dcf..7792e3e7dc 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -426,10 +426,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *ti;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED");
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_clear(pinfo->cinfo, COL_INFO);
- }
+ col_clear(pinfo->cinfo, COL_INFO);
/* Start Decoding Here. */
pppoe_code = tvb_get_guint8(tvb, 1);
@@ -677,10 +674,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvbuff_t *next_tvb;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoES");
- if (check_col(pinfo->cinfo,COL_INFO))
- {
- col_clear(pinfo->cinfo,COL_INFO);
- }
+ col_clear(pinfo->cinfo, COL_INFO);
/* Start Decoding Here. */
pppoe_code = tvb_get_guint8(tvb, 1);