X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/37117d76c0e5bdb3194c2fec8d880c5f570e9823..38700c7f24646dfbc6ac0ed529d3ed727c545cd0:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 0e7777e9..e491515c 100644 --- a/print-ether.c +++ b/print-ether.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -185,10 +184,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 +322,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: