diff options
| author | pkelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
|---|---|---|
| committer | pkelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
| commit | 7e965066ede451d7a551dd68d6c59acf32e4846e (patch) | |
| tree | f0c2243cc0a2a59f3eb1354ba3987d4cbcb788bc /contrib/tcpdump/print-mpls.c | |
| parent | 732211dc794db586649eabfc1d517b8a477440f5 (diff) | |
| parent | c2704d8ede887d9fe69a9a11fe0755b09ec6895d (diff) | |
| download | FreeBSD-src-7e965066ede451d7a551dd68d6c59acf32e4846e.zip FreeBSD-src-7e965066ede451d7a551dd68d6c59acf32e4846e.tar.gz | |
MFV r285191: tcpdump 4.7.4.
Also, the changes made in r272451 and r272653 that were lost in the
merge of 4.6.2 (r276788) have been restored.
PR: 199568
Differential Revision: https://reviews.freebsd.org/D3007
Reviewed by: brooks, hiren
Approved by: jmallett (mentor)
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/print-mpls.c')
| -rw-r--r-- | contrib/tcpdump/print-mpls.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/contrib/tcpdump/print-mpls.c b/contrib/tcpdump/print-mpls.c index 039781a..bc34d50 100644 --- a/contrib/tcpdump/print-mpls.c +++ b/contrib/tcpdump/print-mpls.c @@ -186,11 +186,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length) break; case PT_IPV6: -#ifdef INET6 ip6_print(ndo, p, length - (p - bp)); -#else - ND_PRINT((ndo, "IPv6, length: %u", length)); -#endif break; case PT_OSI: |
