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-gre.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-gre.c')
| -rw-r--r-- | contrib/tcpdump/print-gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-gre.c b/contrib/tcpdump/print-gre.c index 106e6fd..b6fa522 100644 --- a/contrib/tcpdump/print-gre.c +++ b/contrib/tcpdump/print-gre.c @@ -210,7 +210,7 @@ gre_print_0(const u_char *bp, u_int length) break; #ifdef INET6 case ETHERTYPE_IPV6: - ip6_print(bp, len); + ip6_print(gndo, bp, len); break; #endif case ETHERTYPE_MPLS: @@ -226,7 +226,7 @@ gre_print_0(const u_char *bp, u_int length) isoclns_print(bp, len, len); break; case ETHERTYPE_TEB: - ether_print(bp, len, len, NULL, NULL); + ether_print(gndo, bp, len, len, NULL, NULL); break; default: printf("gre-proto-0x%x", prot); |
