aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nhrp.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 08:14:59 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 08:14:59 +0000
commit6f85cafd57b8eb672cbf5682848bb5ee5cb78517 (patch)
treee77267cdd463c269c8fb7bbefda18517ed363cbb /epan/dissectors/packet-nhrp.c
parent7a1740736d1aca5c3f0e07951327d24056237c5c (diff)
Don't guard col_clear with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29346 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-nhrp.c')
-rw-r--r--epan/dissectors/packet-nhrp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index e3ceef7af0..8c1abbffa7 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -841,9 +841,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
oui_info_t *oui_info;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_clear(pinfo->cinfo, COL_INFO);
- }
+ col_clear(pinfo->cinfo, COL_INFO);
memset(&hdr, 0, sizeof(e_nhrp_hdr));