diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-10-08 01:50:50 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-10-08 01:50:50 +0000 |
| commit | fae45ea6a1b7401fb13edf91bf7eb6bf683a13ab (patch) | |
| tree | fb7ef11f9cab5f24e8ab1fed842042099497e717 /epan/dissectors/packet-vlan.c | |
| parent | d4c3cbea6d352f0700a0458931fb7a095ec694b5 (diff) | |
Remove check_col()
svn path=/trunk/; revision=34426
Diffstat (limited to 'epan/dissectors/packet-vlan.c')
| -rw-r--r-- | epan/dissectors/packet-vlan.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index d545d14a80..b138f4c6db 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -104,13 +104,9 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tci = tvb_get_ntohs( tvb, 0 ); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %u CFI: %u ID: %u", - (tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF)); - } - if ( check_col(pinfo->cinfo, COL_8021Q_VLAN_ID)) { - col_add_fstr(pinfo->cinfo, COL_8021Q_VLAN_ID, "%u", (tci & 0xFFF)); - } + col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %u CFI: %u ID: %u", + (tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF)); + col_add_fstr(pinfo->cinfo, COL_8021Q_VLAN_ID, "%u", (tci & 0xFFF)); vlan_tree = NULL; @@ -118,7 +114,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_vlan, tvb, 0, 4, FALSE); if (vlan_summary_in_tree) { - proto_item_append_text(ti, ", PRI: %u, CFI: %u, ID: %u", + proto_item_append_text(ti, ", PRI: %u, CFI: %u, ID: %u", (tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF)); } |