diff options
| author | fenner <fenner@FreeBSD.org> | 2002-06-21 00:49:02 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2002-06-21 00:49:02 +0000 |
| commit | 6d9538de202e4b8787f1b1a2ee8dce6273a43dc2 (patch) | |
| tree | cf4df09e1e89ebd11358792543230083e577ad0f /contrib/tcpdump/ethertype.h | |
| parent | d832be42ce7cc0a492cddc15e8429bc29fb46462 (diff) | |
| download | FreeBSD-src-6d9538de202e4b8787f1b1a2ee8dce6273a43dc2.zip FreeBSD-src-6d9538de202e4b8787f1b1a2ee8dce6273a43dc2.tar.gz | |
Merge tcpdump 3.7.1
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
| -rw-r--r-- | contrib/tcpdump/ethertype.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index 86d96fe..caff2579 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -18,7 +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.12 2000/09/23 08:03:30 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.16 2001/06/21 17:56:02 itojun Exp $ (LBL) + * * $FreeBSD$ */ @@ -98,11 +99,20 @@ #define ETHERTYPE_8021Q 0x8100 #endif #ifndef ETHERTYPE_IPX -#define ETHERTYPE_IPX 0x8137 +#define ETHERTYPE_IPX 0x8137 #endif #ifndef ETHERTYPE_IPV6 #define ETHERTYPE_IPV6 0x86dd #endif +#ifndef ETHERTYPE_PPP +#define ETHERTYPE_PPP 0x880b +#endif +#ifndef ETHERTYPE_MPLS +#define ETHERTYPE_MPLS 0x8847 +#endif +#ifndef ETHERTYPE_MPLS_MULTI +#define ETHERTYPE_MPLS_MULTI 0x8848 +#endif #ifndef ETHERTYPE_PPPOED #define ETHERTYPE_PPPOED 0x8863 #endif |
