diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-01-25 23:50:48 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-01-25 23:50:48 +0000 |
| commit | bbf3806ba76b156e28facf73abfc097fb9649418 (patch) | |
| tree | d51b0af9558c62c952ead5cd3b4131d5f87960b2 /wiretap | |
| parent | f78b9630824c1cb0e54c6dbe791e6ab5e7570cf0 (diff) | |
Don't muck with the Ethernet pseudo-header if we have an 802.11 capture.
svn path=/trunk/; revision=9857
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netxray.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 8922a8b429..9d000a28fa 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1,6 +1,6 @@ /* netxray.c * - * $Id: netxray.c,v 1.87 2004/01/25 21:55:16 guy Exp $ + * $Id: netxray.c,v 1.88 2004/01/25 23:50:48 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -824,15 +824,23 @@ netxray_set_pseudo_header(wtap *wth, const guint8 *pd, int len, /* * FCS. */ +#if 0 pseudo_header->eth.fcs_len = 4; +#else + padding = 4; +#endif } else { /* * Junk. */ padding = 4; } +#if 0 } else pseudo_header->eth.fcs_len = 0; +#else + } +#endif break; case WTAP_ENCAP_ISDN: |