X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/37117d76c0e5bdb3194c2fec8d880c5f570e9823..refs/pull/433/head:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 0e7777e9..e57d993b 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: