git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7541b47
)
Adding to col info is probably useless as next dissector will overwrite it.
author
Anders Broman
<anders.broman@ericsson.com>
Mon, 14 Oct 2013 18:18:16 +0000
(18:18 -0000)
committer
Anders Broman
<anders.broman@ericsson.com>
Mon, 14 Oct 2013 18:18:16 +0000
(18:18 -0000)
svn path=/trunk/; revision=52604
epan/dissectors/packet-vlan.c
patch
|
blob
|
history
diff --git
a/epan/dissectors/packet-vlan.c
b/epan/dissectors/packet-vlan.c
index 340baf969df14b86fce3a3619036839d178a7ddd..cb96a307ec7285d839f87197816e0f88e88a1bee 100644
(file)
--- a/
epan/dissectors/packet-vlan.c
+++ b/
epan/dissectors/packet-vlan.c
@@
-105,8
+105,11
@@
dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tci = tvb_get_ntohs( tvb, 0 );
+#if 0
+ /* Adding to col info is probably useless as next dissector will overwrite it */
col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %u CFI: %u ID: %u",
(tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF));
+#endif
col_add_fstr(pinfo->cinfo, COL_8021Q_VLAN_ID, "%u", (tci & 0xFFF));
vlan_tree = NULL;