diff options
author | fenner <fenner@FreeBSD.org> | 2000-01-30 01:05:24 +0000 |
---|---|---|
committer | fenner <fenner@FreeBSD.org> | 2000-01-30 01:05:24 +0000 |
commit | c780ea93f313e481b5e76344d0c206cf1568e727 (patch) | |
tree | cd7ad03c67eea60f72e32cf23a00c051002101b6 /contrib/tcpdump/ethertype.h | |
parent | 107d567bf3f832610112e1377af645f8f827e1dd (diff) | |
download | FreeBSD-src-c780ea93f313e481b5e76344d0c206cf1568e727.zip FreeBSD-src-c780ea93f313e481b5e76344d0c206cf1568e727.tar.gz |
Merge tcpdump 3.5
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
-rw-r--r-- | contrib/tcpdump/ethertype.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index 487183a..56bfa3c 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: ethertype.h,v 1.6 96/07/14 18:21:49 leres Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.7.2.1 2000/01/29 22:00:12 fenner Exp $ (LBL) * $FreeBSD$ */ @@ -72,14 +72,20 @@ #ifndef ETHERTYPE_AARP #define ETHERTYPE_AARP 0x80f3 #endif +#ifndef ETHERTYPE_8021Q +#define ETHERTYPE_8021Q 0x8100 +#endif #ifndef ETHERTYPE_IPX #define ETHERTYPE_IPX 0x8137 #endif -#ifndef ETHERTYPE_PPPOE_DISC -#define ETHERTYPE_PPPOE_DISC 0x8863 +#ifndef ETHERTYPE_IPV6 +#define ETHERTYPE_IPV6 0x86dd +#endif +#ifndef ETHERTYPE_PPPOED +#define ETHERTYPE_PPPOED 0x8863 #endif -#ifndef ETHERTYPE_PPPOE_SESS -#define ETHERTYPE_PPPOE_SESS 0x8864 +#ifndef ETHERTYPE_PPPOES +#define ETHERTYPE_PPPOES 0x8864 #endif #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 |