diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
| commit | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (patch) | |
| tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-l2tp.c | |
| parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) | |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors/packet-l2tp.c')
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 8553635b20..f3de64de61 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1721,8 +1721,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* build output for closed L2tp frame displayed */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); switch (L2TP_VERSION(control)) { @@ -1910,8 +1909,7 @@ dissect_l2tp_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* Only L2TPv3 runs directly over IP */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TPv3"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); sid = tvb_get_ntohl(tvb, index); if (sid == 0) { |