diff options
author | dim <dim@FreeBSD.org> | 2015-07-08 18:43:55 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-07-08 18:43:55 +0000 |
commit | 91db3ac96dc3ffb6a6f9079ef98cfe0b9af0f05a (patch) | |
tree | f1fa334feb87f7c8ece7d10caf385b2726e20c57 /contrib/tcpdump/print-ether.c | |
parent | 706271a799ea439f560140f156e94c430e19fcd3 (diff) | |
parent | c17f8bfdd50cd481c229672bc267cb3c845ace07 (diff) | |
download | FreeBSD-src-91db3ac96dc3ffb6a6f9079ef98cfe0b9af0f05a.zip FreeBSD-src-91db3ac96dc3ffb6a6f9079ef98cfe0b9af0f05a.tar.gz |
Merge ^/head r285153 through r285283.
Diffstat (limited to 'contrib/tcpdump/print-ether.c')
-rw-r--r-- | contrib/tcpdump/print-ether.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c index 8258cf1..b96620f 100644 --- a/contrib/tcpdump/print-ether.c +++ b/contrib/tcpdump/print-ether.c @@ -187,10 +187,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); @@ -328,11 +325,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: |