diff options
| author | Patrick Kelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
|---|---|---|
| committer | Patrick Kelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
| commit | 8bdc5a6251ddffc81a013f36b4384c8ace9c4bec (patch) | |
| tree | f0c2243cc0a2a59f3eb1354ba3987d4cbcb788bc /contrib/tcpdump/print-chdlc.c | |
| parent | 6bae05d951855544018d42bbf8c04f3ceea630b8 (diff) | |
| parent | 7041091186ddb72670e3e2d8254859ed31d3f2e6 (diff) | |
| download | src-8bdc5a6251ddffc81a013f36b4384c8ace9c4bec.tar.gz src-8bdc5a6251ddffc81a013f36b4384c8ace9c4bec.zip | |
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
Notes
Notes:
svn path=/head/; revision=285275
Diffstat (limited to 'contrib/tcpdump/print-chdlc.c')
| -rw-r--r-- | contrib/tcpdump/print-chdlc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-chdlc.c b/contrib/tcpdump/print-chdlc.c index c1f3d3464828..3951ef77cdff 100644 --- a/contrib/tcpdump/print-chdlc.c +++ b/contrib/tcpdump/print-chdlc.c @@ -56,7 +56,8 @@ chdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register co } u_int -chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) { +chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) +{ u_int proto; proto = EXTRACT_16BITS(&p[2]); @@ -75,11 +76,9 @@ chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) { case ETHERTYPE_IP: ip_print(ndo, p, length); break; -#ifdef INET6 case ETHERTYPE_IPV6: ip6_print(ndo, p, length); break; -#endif case CHDLC_TYPE_SLARP: chdlc_slarp_print(ndo, p, length); break; |