Get rid of check_col().

svn path=/trunk/; revision=32426

25 files changed, 94 insertions, 361 deletions

diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index 4fcfc652ec..1ac882f278 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -638,10 +638,7 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo,
 	guint starting_offset = payload_offset;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packing subhdr");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packing subhdr");
 	/* add the Packing subheader info */
 	proto_item_append_text(parent_item, ", Packing Subheader");
 	/* display Packing subheader type */
@@ -739,10 +736,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 	{	/* we are being asked for details */
 #ifdef DEBUG
 		/* update the info column */
-		if (check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "GMH");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "GMH");
 #endif
 		/* Get the frame length */
 		tvb_len =  tvb_reported_length(tvb);
@@ -852,10 +846,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 		/* if Mesh subheader is present */
 		if (mesh_subheader)
 		{	/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Mesh subhdr");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Mesh subhdr");
 			/* add the Mesh subheader info */
 			proto_item_append_text(parent_item, ", Mesh Subheader");
 			/* display Mesh subheader type */
@@ -874,10 +865,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 			if (is_down_link(&(pinfo->src)))
 			{	/* Fast-feedback allocation (DL) subheader is present */
 				/* update the info column */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Fast-fb subhdr");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Fast-fb subhdr");
 				/* add the Fast-feedback subheader info */
 				proto_item_append_text(parent_item, ", Fast-feedback Subheader");
 				/* display Fast-feedback allocation subheader type */
@@ -892,10 +880,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 			}
 			else	/* Grant management (UL) subheader is present */
 			{	/* update the info column */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Grant mgmt subhdr");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Grant mgmt subhdr");
 				/* add the Grant management subheader info */
 				proto_item_append_text(parent_item, ", Grant Management Subheader");
 				/* display Grant management subheader type */
@@ -947,10 +932,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 		/* if Fragmentation subheader is present */
 		if (fragment_subheader)
 		{	/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Frag subhdr");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Frag subhdr");
 			/* add the Fragmentation subheader info */
 			proto_item_append_text(parent_item, ", Frag Subheader");
 			/* display Fragmentation subheader type */
@@ -1125,8 +1107,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 /*					if (frag_type == LAST_FRAG)*/
 					{	/* error */
 						/* update the info column */
-						if (check_col(pinfo->cinfo, COL_INFO))
-							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Dropped the incomplete frame");
+						col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Dropped the incomplete frame");
 					}
 #endif
 #if 0
@@ -1157,8 +1138,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 						if (ret_length != new_payload_len)
 						{	/* error */
 							/* update the info column */
-							if (check_col(pinfo->cinfo, COL_INFO))
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "incorrect ARQ fb payload size");
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "incorrect ARQ fb payload size");
 						}
 #endif
 					}
@@ -1166,10 +1146,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 					{	/* check the payload type */
 						if (mac_cid == cid_padding)
 						{	/* update the info column */
-							if (check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Padding CID");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Padding CID");
 							/* get the parent */
 							generic_item = proto_tree_get_parent(tree);
 							/* add the MAC header info */
@@ -1188,10 +1165,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 						}
 						else /* data transport PDU */
 						{	/* update the info column */
-							if (check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Data");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Data");
 							/* add the MAC payload info */
 							proto_item_append_text(parent_item, ", Data");
 							/* display payload info */
@@ -1283,10 +1257,7 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 	proto_tree *ti_tree = NULL;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Ext subhdrs");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Ext subhdrs");
 
 	/* Get the tvb reported length */
 	length =  tvb_reported_length(tvb);
@@ -1418,10 +1389,7 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
 	proto_tree *sub_tree = NULL;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "ARQ feedback payld");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "ARQ feedback payld");
 
 	/* add the MAC header info */
 	proto_item_append_text(parent_item, ", ARQ feedback payload");
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c
index 802dc327bc..0c9f138001 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/wimax/mac_hd_type1_decoder.c
@@ -233,10 +233,7 @@ void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 		}
 #ifdef DEBUG
 		/* update the info column */
-		if (check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, type1_subtype_abbrv[]);
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, type1_subtype_abbrv[]);
 #endif
 		/* get the parent */
 		parent_item = proto_tree_get_parent(tree);
@@ -251,14 +248,12 @@ void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 		if(sub_type < TYPE_I_SUBTYPE_MAX)
 		{
 			/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, type1_subtype_abbrv[sub_type]);
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, type1_subtype_abbrv[sub_type]);
 		}
 		else
 		{
 			/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Unknown type 1 subtype");
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Unknown type 1 subtype");
 			/* display MAC Header Type I Subtype */
 			proto_tree_add_protocol_format(ti_tree, proto_mac_header_type_1_decoder, tvb, offset, tvb_len, "Unknown type 1 subtype: %u", sub_type);
 			/* display the MAC Type I Header in Hex */
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c
index de0e015a59..fc12f8137e 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/wimax/mac_hd_type2_decoder.c
@@ -408,10 +408,7 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 		}
 #ifdef DEBUG
 		/* update the info column */
-		if (check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "MAC Signaling Header Type II");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "MAC Signaling Header Type II");
 #endif
 		/* get the parent */
 		parent_item = proto_tree_get_parent(tree);
@@ -438,14 +435,12 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 			if(fb_type < TYPE_II_FB_TYPE_MAX)
 			{
 				/* update the info column */
-				if (check_col(pinfo->cinfo, COL_INFO))
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, type2_fb_type_abbrv[fb_type]);
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, type2_fb_type_abbrv[fb_type]);
 			}
 			else
 			{
 				/* update the info column */
-				if (check_col(pinfo->cinfo, COL_INFO))
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Unknown type 2 fb type");
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Unknown type 2 fb type");
 				/* display the MAC Type I Header in Hex */
 				proto_tree_add_item(ti_tree, hf_mac_header_type_2_value_bytes, tvb, offset, tvb_len, FALSE);
 				return;
@@ -791,10 +786,7 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 		else
 		{
 			/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Error - Undefined Type");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Error - Undefined Type");
 		}
 	}
 }
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c
index 27b1134de2..8531ec3e2d 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/wimax/mac_mgmt_msg_decoder.c
@@ -210,10 +210,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 		if(message_type < MAC_MGMT_MSG_TYPE_MAX)
 		{
 			/* Display message type in Info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", mgt_msg_abbrv[message_type]);
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", mgt_msg_abbrv[message_type]);
 		}
 		else
 		{
diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c
index 0f4afedc95..83cde282ef 100644
--- a/plugins/wimax/msg_dcd.c
+++ b/plugins/wimax/msg_dcd.c
@@ -386,10 +386,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DCD TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DCD TLV error");
 				proto_tree_add_item(dcd_tree, hf_dcd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -423,10 +420,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DL Burst Profile TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DL Burst Profile TLV error");
 							proto_tree_add_item(tlv_tree, hf_dcd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
@@ -711,10 +705,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Trigger TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Trigger TLV error");
 							proto_tree_add_item(tlv_tree, hf_dcd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c
index fa453b755b..d8ee6b1ff8 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/wimax/msg_dlmap.c
@@ -2107,10 +2107,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
     guint32	   mac_crc, calculated_crc;
 
     /* update the info column */
-    if (check_col(pinfo->cinfo, COL_INFO))
-    {
-        col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed DL-MAP");
-    }
+    col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed DL-MAP");
 
     INC_CID = 0;
 
diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c
index 0b7ade90b3..9217e6485f 100644
--- a/plugins/wimax/msg_dreg.c
+++ b/plugins/wimax/msg_dreg.c
@@ -436,10 +436,7 @@ void dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pr
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-REQ TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-REQ TLV error");
 				proto_tree_add_item(dreg_req_tree, hf_dreg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -525,10 +522,7 @@ void dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pr
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-CMD TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-CMD TLV error");
 				proto_tree_add_item(dreg_cmd_tree, hf_dreg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c
index f625572cb9..d4aa9406e5 100644
--- a/plugins/wimax/msg_dsd.c
+++ b/plugins/wimax/msg_dsd.c
@@ -116,10 +116,7 @@ void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DSD-REQ TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DSD-REQ TLV error");
 				proto_tree_add_item(dsd_tree, hf_dsd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -205,10 +202,7 @@ void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DSD RSP TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DSD RSP TLV error");
 				proto_tree_add_item(dsd_tree, hf_dsd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c
index caadf2f258..a5d43d5495 100644
--- a/plugins/wimax/msg_reg_req.c
+++ b/plugins/wimax/msg_reg_req.c
@@ -369,10 +369,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb
 				length = get_tlv_length(&tlv_info);
 				if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 				{	/* invalid tlv info */
-					if (check_col(pinfo->cinfo, COL_INFO))
-					{
-						col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error");
-					}
+					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error");
 					proto_tree_add_item(reg_req_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 					break;
 				}
@@ -557,10 +554,7 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error");
 				proto_tree_add_item(reg_req_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c
index 6c285c8b81..8262bfffd5 100644
--- a/plugins/wimax/msg_reg_rsp.c
+++ b/plugins/wimax/msg_reg_rsp.c
@@ -130,10 +130,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error");
 				proto_tree_add_item(reg_rsp_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -197,10 +194,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						sub_tlv_len = get_tlv_length(&sub_tlv_info);
 						if (tlv_type == -1 || sub_tlv_len > MAX_TLV_LEN || sub_tlv_len < 1)
 						{	/* invalid tlv info */
-							if (check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error");
 							proto_tree_add_item(reg_rsp_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 							break;
 						}
diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c
index df636b9214..df8ab1a0ef 100644
--- a/plugins/wimax/msg_rep.c
+++ b/plugins/wimax/msg_rep.c
@@ -298,10 +298,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ TLV error");
 				proto_tree_add_item(rep_tree, hf_rep_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -327,10 +324,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 					length = get_tlv_length(&tlv_info);
 					if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 					{	/* invalid tlv info */
-						if(check_col(pinfo->cinfo, COL_INFO))
-						{
-							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ Report Request TLV error");
-						}
+						col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ Report Request TLV error");
 						proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, (offset + tlv_offset), (tlv_len - offset - tlv_offset), FALSE);
 						break;
 					}
@@ -472,10 +466,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP TLV error");
 				proto_tree_add_item(rep_tree, hf_rep_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -501,10 +492,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP report subtype TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP report subtype TLV error");
 							proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
@@ -579,10 +567,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP channel subtype TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP channel subtype TLV error");
 							proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
@@ -631,10 +616,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific phy CINR report subtype TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific phy CINR report subtype TLV error");
 							proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
@@ -722,10 +704,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble physical CINR report subtype TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble physical CINR report subtype TLV error");
 							proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
@@ -770,10 +749,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific effective CINR report subtype TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific effective CINR report subtype TLV error");
 							proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
@@ -832,10 +808,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble effective CINR report subtype TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble effective CINR report subtype TLV error");
 							proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c
index cfe80284dd..7949ed372e 100644
--- a/plugins/wimax/msg_res_cmd.c
+++ b/plugins/wimax/msg_res_cmd.c
@@ -93,10 +93,7 @@ void dissect_mac_mgmt_msg_res_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RES-CMD TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RES-CMD TLV error");
 				proto_tree_add_item(res_cmd_tree, hf_res_cmd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c
index 148c6dde39..0e5684c6eb 100644
--- a/plugins/wimax/msg_rng_req.c
+++ b/plugins/wimax/msg_rng_req.c
@@ -150,10 +150,7 @@ void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
 			proto_tree_add_item(power_saving_class_tree, hf_rng_invalid_tlv, tvb, offset, (compound_tlv_len - offset), FALSE);
 			break;
 		}
@@ -265,10 +262,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
 				proto_tree_add_item(rng_req_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c
index b671425157..abbcd504b6 100644
--- a/plugins/wimax/msg_rng_rsp.c
+++ b/plugins/wimax/msg_rng_rsp.c
@@ -328,10 +328,7 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error");
 				proto_tree_add_item(rng_rsp_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -487,10 +484,7 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 						sub_tlv_len = get_tlv_length(&sub_tlv_info);
 						if(tlv_type == -1 || sub_tlv_len > MAX_TLV_LEN || sub_tlv_len < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error");
 							proto_tree_add_item(rng_rsp_tree, hf_rng_invalid_tlv, tvb, tlv_offset, (tvb_len - offset), FALSE);
 							break;
 						}
diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c
index f133a016d6..203a09122f 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/wimax/msg_sbc.c
@@ -585,19 +585,13 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-REQ TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-REQ TLV error");
 				proto_tree_add_item(sbc_tree, hf_sbc_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
 			if (tlv_type == 0)
 			{	/* invalid tlv type */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type");
 				proto_tree_add_item(sbc_tree, hf_sbc_unknown_type, tvb, offset, 1, FALSE);
 				offset++;
 				continue;
@@ -1146,19 +1140,13 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 			tlv_len = get_tlv_length(&tlv_info);
 			if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-RSP TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-RSP TLV error");
 				proto_tree_add_item(sbc_tree, hf_sbc_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
 			if (tlv_type == 0)
 			{	/* invalid tlv type */
-				if (check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type");
 				proto_tree_add_item(sbc_tree, hf_sbc_unknown_type, tvb, offset, 1, FALSE);
 				offset++;
 				continue;
diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c
index 5414936609..7bece4e53f 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/wimax/msg_ucd.c
@@ -284,10 +284,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 			tlv_len = get_tlv_length(&tlv_info);
 			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 			{	/* invalid tlv info */
-				if(check_col(pinfo->cinfo, COL_INFO))
-				{
-					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UCD TLV error");
-				}
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UCD TLV error");
 				proto_tree_add_item(ucd_tree,hf_ucd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 				break;
 			}
@@ -370,10 +367,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 						tlv_type = get_tlv_type(&tlv_info);
 						if(tlv_type == -1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UL Burst Profile error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UL Burst Profile error");
 							proto_tree_add_item(tlv_tree, hf_ucd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
 							break;
 						}
diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c
index 244167f029..c569154400 100644
--- a/plugins/wimax/wimax_cdma_code_decoder.c
+++ b/plugins/wimax/wimax_cdma_code_decoder.c
@@ -53,10 +53,7 @@ static void dissect_wimax_cdma_code_decoder(tvbuff_t *tvb, packet_info *pinfo, p
 	proto_tree *cdma_tree = NULL;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CDMA Code Attribute");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CDMA Code Attribute");
 	if (tree)
 	{	/* we are being asked for details */
 		/* get the tvb reported length */
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
index 183c03e651..f389c825cd 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
@@ -388,10 +388,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
 
 #ifdef DEBUG
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compact UL-MAP IEs");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compact UL-MAP IEs");
 #endif
 	/* set the local offset */
 	ul_map_offset = offset;
@@ -978,10 +975,7 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info *
 
 #ifdef DEBUG
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RCID IE");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RCID IE");
 #endif
 	if(nibble_offset & 1)
 	{
@@ -1068,10 +1062,7 @@ static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packe
 
 #ifdef DEBUG
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ Control IE");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ Control IE");
 #endif
 	/* Get the first byte */
 	byte = tvb_get_guint8(tvb, offset);
@@ -1134,10 +1125,7 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
 
 #ifdef DEBUG
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UL-MAP Extension IE");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UL-MAP Extension IE");
 #endif
 	/* Get the first 16-bit word */
 	tvb_value = tvb_get_ntohs(tvb, offset);
@@ -1213,10 +1201,7 @@ guint wimax_cdma_allocation_ie_decoder(proto_tree *tree, packet_info *pinfo _U_,
 
 #ifdef DEBUG
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CDMA Allocation IE");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CDMA Allocation IE");
 #endif
 	/* Get the first byte */
 	byte = tvb_get_guint8(tvb, offset);
@@ -1281,10 +1266,7 @@ guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi
 
 #ifdef DEBUG
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Extended UIUC IE");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Extended UIUC IE");
 #endif
 
 	/* get the first byte */
diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c
index 33b8004f3c..6fa34b60cf 100644
--- a/plugins/wimax/wimax_fch_decoder.c
+++ b/plugins/wimax/wimax_fch_decoder.c
@@ -110,10 +110,7 @@ static void dissect_wimax_fch_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 	if(!bs_address.len)
 		COPY_ADDRESS(&bs_address, &(pinfo->src));
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "FCH");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "FCH");
 	if (tree)
 	{	/* we are being asked for details */
 		/* display FCH dissector info */
diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c
index 9e1713be0e..3866f76f94 100644
--- a/plugins/wimax/wimax_ffb_decoder.c
+++ b/plugins/wimax/wimax_ffb_decoder.c
@@ -56,10 +56,7 @@ static void dissect_wimax_ffb_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 	proto_tree *ffb_tree = NULL;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Fast Feedback Burst:");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Fast Feedback Burst:");
 	if (tree)
 	{	/* we are being asked for details */
 		/* get the tvb reported length */
diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c
index 0e991e0427..3f1b9220d4 100644
--- a/plugins/wimax/wimax_hack_decoder.c
+++ b/plugins/wimax/wimax_hack_decoder.c
@@ -70,10 +70,7 @@ static void dissect_wimax_hack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 	proto_tree *hack_tree = NULL;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ ACK Burst:");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ ACK Burst:");
 	if (tree)
 	{	/* we are being asked for details */
 		/* get the tvb reported length */
diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c
index 0610e8e6f2..7015db628b 100644
--- a/plugins/wimax/wimax_harq_map_decoder.c
+++ b/plugins/wimax/wimax_harq_map_decoder.c
@@ -97,10 +97,7 @@ void dissector_wimax_harq_map_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 		return;
 	}
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ-MAP Message: ");
-	}
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ-MAP Message: ");
 	if (tree)
 	{	/* we are being asked for details */
 		/* get the parent */
diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c
index b60fd927cb..0874db752c 100644
--- a/plugins/wimax/wimax_pdu_decoder.c
+++ b/plugins/wimax/wimax_pdu_decoder.c
@@ -147,10 +147,7 @@ static void dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 		else if((first_byte & WIMAX_INVALID_PDU_MASK) == WIMAX_INVALID_PDU_MASK)
 		{	/* Invalid PDU */
 			/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PDU");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PDU");
 			/* display message */
 			pdu_item = proto_tree_add_protocol_format(tree, proto_wimax_pdu_decoder, tvb, offset, length, "Invalid PDU  (%u bytes)", length);
 			/* add subtree */
@@ -167,10 +164,7 @@ static void dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 		if(mac_hcs != mac_hcs_calculated)
 		{
 			/* update the info column */
-			if (check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "MAC Header CRC error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "MAC Header CRC error");
 			/* display message */
 			pdu_item = proto_tree_add_protocol_format(tree, proto_wimax_pdu_decoder, tvb, offset, WIMAX_MAC_HEADER_SIZE, "MAC Header CRC error %X (in header) and %X (calculated)", mac_hcs, mac_hcs_calculated);
 			/* add subtree */
diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c
index d36866bbb8..6c84a01aba 100644
--- a/plugins/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/wimax/wimax_phy_attributes_decoder.c
@@ -89,11 +89,8 @@ static void dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pin
 	proto_tree *phy_tree = NULL;
 
 	/* update the info column */
-	if (check_col(pinfo->cinfo, COL_INFO))
-	{
-		/*col_append_str(pinfo->cinfo, COL_INFO, "PDU Burst Physical Attributes:");*/
-		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHY-attr");
-	}
+	/*col_append_str(pinfo->cinfo, COL_INFO, "PDU Burst Physical Attributes:");*/
+	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHY-attr");
 	if (tree)
 	{	/* we are being asked for details */
 		/* get the tvb reported length */
diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c
index 0c78d3f8ef..b60e501cb2 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/wimax/wimax_utils.c
@@ -1715,10 +1715,7 @@ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Error Parameter Set");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Error Parameter Set");
 		return;
 	}
 	/* process the classifier error parameter set */
@@ -1731,10 +1728,7 @@ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "EPS TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "EPS TLV error");
 			proto_tree_add_item(ceps_tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -1803,10 +1797,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Convergence Service Parameter Encoding Rules");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Convergence Service Parameter Encoding Rules");
 		return;
 	}
 	/* process WiMax Service Flow Encodings */
@@ -1819,10 +1810,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CSPER TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CSPER TLV error");
 			proto_tree_add_item(csper_tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -1854,10 +1842,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "ATM Classifier TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "ATM Classifier TLV error");
 							proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), FALSE);
 							break;
 						}
@@ -1931,10 +1916,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packet Classification Rule TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packet Classification Rule TLV error");
 							proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), FALSE);
 							break;
 						}
@@ -2091,10 +2073,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
 						length = get_tlv_length(&tlv_info);
 						if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
 						{	/* invalid tlv info */
-							if(check_col(pinfo->cinfo, COL_INFO))
-							{
-								col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHS n Rule TLV error");
-							}
+							col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHS n Rule TLV error");
 							proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), FALSE);
 							break;
 						}
@@ -2177,10 +2156,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Service Flow Encodings");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Service Flow Encodings");
 		return;
 	}
 	while(offset < tvb_len)
@@ -2192,10 +2168,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Service Flow Encodings TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Service Flow Encodings TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -2617,10 +2590,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Security Negotiation Parameters");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Security Negotiation Parameters");
 		return;
 	}
 	/* process Security Negotiation Parameter TLVs */
@@ -2634,10 +2604,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Negotiation Params TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Negotiation Params TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -2740,10 +2707,7 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Crypto Suite List");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Crypto Suite List");
 		return;
 	}
 	/* process Cryptographic Suite List (11.9.15) */
@@ -2756,10 +2720,7 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Crypto Suite List TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Crypto Suite List TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -2813,10 +2774,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PKM TLV");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PKM TLV");
 		return;
 	}
 	/* process PKM message TLV Encoded Attributes (11.9) */
@@ -2830,10 +2788,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -3043,10 +2998,7 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid TEK Params");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid TEK Params");
 		return;
 	}
 	/* process PKM Message TEK Parameters (11.9.8) */
@@ -3060,10 +3012,7 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "TEK Param TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "TEK Param TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -3130,10 +3079,7 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo,
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PKM Config Settings");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PKM Config Settings");
 		return;
 	}
 	/* process PKM Configuration Settings (11.9.19) */
@@ -3147,10 +3093,7 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo,
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM Config Settings TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM Config Settings TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -3225,10 +3168,7 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SA-Descriptor");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SA-Descriptor");
 		return;
 	}
 	/* process SA-Descriptor (11.9.17) */
@@ -3242,10 +3182,7 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SA-Descriptor TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SA-Descriptor TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -3311,10 +3248,7 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Security Capabilities");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Security Capabilities");
 		return;
 	}
 	/* process Security Capabilities (11.9.13) */
@@ -3328,10 +3262,7 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Capabilities TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Capabilities TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -3383,10 +3314,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Vendor Specific Info");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Vendor Specific Info");
 		proto_tree_add_text(tree, tvb, 0, tvb_len, "Invalid TLV info");
 		return;
 	}
@@ -3401,10 +3329,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Vendor Specific Info TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Vendor Specific Info TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}
@@ -3473,10 +3398,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 	/* report error if the packet size is less than 2 bytes (type+length) */
 	if(tvb_len < 2)
 	{	/* invalid tlv info */
-		if(check_col(pinfo->cinfo, COL_INFO))
-		{
-			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Common TLV encoding");
-		}
+		col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Common TLV encoding");
 		proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, 0, tvb_len, FALSE);
 		return 0;
 	}
@@ -3491,10 +3413,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
 		tlv_len = get_tlv_length(&tlv_info);
 		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
 		{	/* invalid tlv info */
-			if(check_col(pinfo->cinfo, COL_INFO))
-			{
-				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Common TLV encoding TLV error");
-			}
+			col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Common TLV encoding TLV error");
 			proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
 			break;
 		}