summaryrefslogtreecommitdiff
path: root/print-ether.c
diff options
context:
space:
mode:
authorPatrick Kelsey <pkelsey@FreeBSD.org>2015-07-06 02:16:08 +0000
committerPatrick Kelsey <pkelsey@FreeBSD.org>2015-07-06 02:16:08 +0000
commit7041091186ddb72670e3e2d8254859ed31d3f2e6 (patch)
treea4829ce6205db3fdb0e6cebd0d396f5c4094bb3b /print-ether.c
parentd3b6650ba68c44e3a488aac17bbe56d0cd0e870d (diff)
Diffstat (limited to 'print-ether.c')
-rw-r--r--print-ether.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/print-ether.c b/print-ether.c
index 0e7777e90a7fb..e57d993b965e8 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -185,10 +185,7 @@ recurse:
if (ndo->ndo_eflag) {
uint16_t tag = EXTRACT_16BITS(p);
- ND_PRINT((ndo, "vlan %u, p %u%s, ",
- tag & 0xfff,
- tag >> 13,
- (tag & 0x1000) ? ", CFI" : ""));
+ ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
}
ether_type = EXTRACT_16BITS(p + 2);
@@ -326,11 +323,9 @@ ethertype_print(netdissect_options *ndo,
ip_print(ndo, p, length);
return (1);
-#ifdef INET6
case ETHERTYPE_IPV6:
ip6_print(ndo, p, length);
return (1);
-#endif /*INET6*/
case ETHERTYPE_ARP:
case ETHERTYPE_REVARP: