diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2009-03-21 18:30:25 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2009-03-21 18:30:25 +0000 |
| commit | a5779b6e02d0404232959eede5a5d3a5c699adaf (patch) | |
| tree | 9e93e51a04c09c3b9b900ef6611b8bbd1290f26f /contrib/tcpdump/ethertype.h | |
| parent | 6b6e256ae1f5d69b5e217c61109e55a30c30f81f (diff) | |
| parent | 0ea0e7ad03dff03bb5448f640640d7904c01c8d4 (diff) | |
| download | src-a5779b6e02d0404232959eede5a5d3a5c699adaf.tar.gz src-a5779b6e02d0404232959eede5a5d3a5c699adaf.zip | |
Merge tcpdump 4.0.0 from the vendor branch.
Notes
Notes:
svn path=/head/; revision=190207
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
| -rw-r--r-- | contrib/tcpdump/ethertype.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index 1555b4d69f4b..456a7d628ecd 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -18,8 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * - * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24.2.1 2005/07/10 14:51:10 hannes Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.29.2.1 2008-02-06 10:49:22 guy Exp $ (LBL) * $FreeBSD$ */ @@ -111,6 +110,9 @@ #ifndef ETHERTYPE_PPP #define ETHERTYPE_PPP 0x880b #endif +#ifndef ETHERTYPE_MPCP +#define ETHERTYPE_MPCP 0x8808 +#endif #ifndef ETHERTYPE_SLOW #define ETHERTYPE_SLOW 0x8809 #endif @@ -135,15 +137,27 @@ #ifndef ETHERTYPE_JUMBO #define ETHERTYPE_JUMBO 0x8870 #endif +#ifndef ETHERTYPE_LLDP +#define ETHERTYPE_LLDP 0x88cc +#endif #ifndef ETHERTYPE_EAPOL #define ETHERTYPE_EAPOL 0x888e #endif +#ifndef ETHERTYPE_RRCP +#define ETHERTYPE_RRCP 0x8899 +#endif #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 #endif #ifndef ETHERTYPE_VMAN #define ETHERTYPE_VMAN 0x9100 /* Extreme VMAN Protocol */ #endif +#ifndef ETHERTYPE_CFM_OLD +#define ETHERTYPE_CFM_OLD 0xabcd /* 802.1ag depreciated */ +#endif +#ifndef ETHERTYPE_CFM +#define ETHERTYPE_CFM 0x8902 /* 802.1ag */ +#endif #ifndef ETHERTYPE_ISO #define ETHERTYPE_ISO 0xfefe /* nonstandard - used in Cisco HDLC encapsulation */ #endif |