diff options
| author | Max Laier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
|---|---|---|
| committer | Max Laier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
| commit | abf2519367045ca1021214ea4a55622810dd8e4e (patch) | |
| tree | 8c8221dcf086879544da49d1342bacd303933fa6 /contrib/tcpdump/print-token.c | |
| parent | e57e181f0987727d6cb3bcb76554c83efe1476d8 (diff) | |
| download | src-abf2519367045ca1021214ea4a55622810dd8e4e.tar.gz src-abf2519367045ca1021214ea4a55622810dd8e4e.zip | |
Resolve merge conflicts
Approved by: re (kensmith)
Obtained from: tcpdump.org
Notes
Notes:
svn path=/head/; revision=172686
Diffstat (limited to 'contrib/tcpdump/print-token.c')
| -rw-r--r-- | contrib/tcpdump/print-token.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c index 0a80fb621c04..8a5f4f55657d 100644 --- a/contrib/tcpdump/print-token.c +++ b/contrib/tcpdump/print-token.c @@ -27,7 +27,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.25.2.1 2005/07/07 01:24:40 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.25.2.2 2005/11/13 12:13:01 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -155,7 +155,6 @@ token_print(const u_char *p, u_int length, u_int caplen) caplen -= hdr_len; /* Frame Control field determines interpretation of packet */ - extracted_ethertype = 0; if (FRAME_TYPE(trp) == TOKEN_FC_LLC) { /* Try to print the LLC-layer header & higher layers */ if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr), |