aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee8021ah.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-ieee8021ah.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-ieee8021ah.c')
-rw-r--r--epan/dissectors/packet-ieee8021ah.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 666f356cd1..4f1d565bea 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -119,8 +119,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_index = proto_ieee8021ad;
/* add info to column display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ad");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ad");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
@@ -313,8 +312,7 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_index = proto_ieee8021ah;
/* add info to column display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ah");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ah");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);