diff options
| author | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | 661b9d94414ea6d11d5b7960aef1f172975ce52b (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/print-fr.c | |
| parent | 63ab347efe2621fc79f689a92c4bbda531593626 (diff) | |
| parent | d36dcecdb3228d24b199eb51cfd7ac666f5b8eb8 (diff) | |
| download | FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.zip FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.tar.gz | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/print-fr.c')
| -rw-r--r-- | contrib/tcpdump/print-fr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c index 67961ae..34db239 100644 --- a/contrib/tcpdump/print-fr.c +++ b/contrib/tcpdump/print-fr.c @@ -258,7 +258,7 @@ fr_print(register const u_char *p, u_int length) if (eflag) fr_hdr_print(length, addr_len, dlci, flags, extracted_ethertype); - if (ethertype_print(extracted_ethertype, + if (ethertype_print(gndo, extracted_ethertype, p+addr_len+ETHERTYPE_LEN, length-addr_len-ETHERTYPE_LEN, length-addr_len-ETHERTYPE_LEN) == 0) @@ -288,7 +288,7 @@ fr_print(register const u_char *p, u_int length) #ifdef INET6 case NLPID_IP6: - ip6_print(p, length); + ip6_print(gndo, p, length); break; #endif case NLPID_CLNP: |
