diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
| commit | 7dacff5dd0aeebda55a754dc5d25feab441b5d03 (patch) | |
| tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/ethertype.h | |
| parent | d9db21b8bcec89e09ac680f84c6d7d0ca014d6df (diff) | |
| download | FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.zip FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.tar.gz | |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
| -rw-r--r-- | contrib/tcpdump/ethertype.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index 63c0c29..808cdcf 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -18,8 +18,8 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.20 2003/07/01 19:10:26 guy Exp $ (LBL) * + * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24 2004/10/07 16:04:07 hannes Exp $ (LBL) * $FreeBSD$ */ @@ -35,6 +35,13 @@ * <netinet/if_ether.h> if all it needs are ETHERTYPE_ values. */ +#ifndef ETHERTYPE_LEN +#define ETHERTYPE_LEN 2 +#endif + +#ifndef ETHERTYPE_GRE_ISO +#define ETHERTYPE_GRE_ISO 0x00FE /* not really an ethertype only used in GRE */ +#endif #ifndef ETHERTYPE_PUP #define ETHERTYPE_PUP 0x0200 /* PUP protocol */ #endif @@ -122,6 +129,12 @@ #ifndef ETHERTYPE_PPPOES2 #define ETHERTYPE_PPPOES2 0x3c13 #endif +#ifndef ETHERTYPE_JUMBO +#define ETHERTYPE_JUMBO 0x8870 +#endif +#ifndef ETHERTYPE_EAPOL +#define ETHERTYPE_EAPOL 0x888e +#endif #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 #endif |
