diff options
| author | Xin LI <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | cac3dcd5f981d8843fb0acc27b4d28af1339af66 (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/print-llc.c | |
| parent | c3a9b90973c6add91710a6a213af772245017d76 (diff) | |
| parent | 60894fde29002aac35c5aff244b0f45c4d590413 (diff) | |
| download | src-cac3dcd5f981d8843fb0acc27b4d28af1339af66.tar.gz src-cac3dcd5f981d8843fb0acc27b4d28af1339af66.zip | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=235530
Diffstat (limited to 'contrib/tcpdump/print-llc.c')
| -rw-r--r-- | contrib/tcpdump/print-llc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-llc.c b/contrib/tcpdump/print-llc.c index 73b4f3b07636..f304dd34d741 100644 --- a/contrib/tcpdump/print-llc.c +++ b/contrib/tcpdump/print-llc.c @@ -419,7 +419,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad) * Cisco hardware; the protocol ID is * an Ethernet protocol type. */ - ret = ethertype_print(et, p, length, caplen); + ret = ethertype_print(gndo, et, p, length, caplen); if (ret) return (ret); break; @@ -434,7 +434,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad) * but used 0x000000 and an Ethernet * packet type for AARP packets. */ - ret = ethertype_print(et, p, length, caplen); + ret = ethertype_print(gndo, et, p, length, caplen); if (ret) return (ret); } @@ -481,7 +481,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad) /* * What remains is an Ethernet packet. */ - ether_print(p, length, caplen, NULL, NULL); + ether_print(gndo, p, length, caplen, NULL, NULL); return (1); case PID_RFC2684_802_5_FCS: |