diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
| commit | f49c5d523af9076a4a59e8dd664f9a897108432e (patch) | |
| tree | e268839e08c106e178b33bd461d8d0a9c6fb5ad9 /contrib/tcpdump/ethertype.h | |
| parent | c371846049d370ab78d943e60e789cdffe0aad3d (diff) | |
| parent | 08263d19579d35a7a65e0c8bcb768504ce76d04e (diff) | |
| download | FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.zip FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.tar.gz | |
MFV r276761: tcpdump 4.6.2.
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
| -rw-r--r-- | contrib/tcpdump/ethertype.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index 2c79ba2..e855221 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -17,8 +17,6 @@ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - * - * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.30 2008-02-06 10:47:53 guy Exp $ (LBL) * $FreeBSD$ */ @@ -169,11 +167,14 @@ #ifndef ETHERTYPE_RRCP #define ETHERTYPE_RRCP 0x8899 #endif +#ifndef ETHERTYPE_AOE +#define ETHERTYPE_AOE 0x88a2 +#endif #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 #endif #ifndef ETHERTYPE_VMAN -#define ETHERTYPE_VMAN 0x9100 /* Extreme VMAN Protocol */ +#define ETHERTYPE_VMAN 0x9100 /* Extreme VMAN Protocol */ #endif #ifndef ETHERTYPE_CFM_OLD #define ETHERTYPE_CFM_OLD 0xabcd /* 802.1ag depreciated */ @@ -181,8 +182,20 @@ #ifndef ETHERTYPE_CFM #define ETHERTYPE_CFM 0x8902 /* 802.1ag */ #endif +#ifndef ETHERTYPE_IEEE1905_1 +#define ETHERTYPE_IEEE1905_1 0x893a /* IEEE 1905.1 */ +#endif #ifndef ETHERTYPE_ISO #define ETHERTYPE_ISO 0xfefe /* nonstandard - used in Cisco HDLC encapsulation */ #endif +#ifndef ETHERTYPE_CALM_FAST +#define ETHERTYPE_CALM_FAST 0x1111 /* ISO CALM FAST */ +#endif +#ifndef ETHERTYPE_GEONET_OLD +#define ETHERTYPE_GEONET_OLD 0x0707 /* ETSI GeoNetworking (before Jan 2013) */ +#endif +#ifndef ETHERTYPE_GEONET +#define ETHERTYPE_GEONET 0x8947 /* ETSI GeoNetworking (Official IEEE registration from Jan 2013) */ +#endif extern const struct tok ethertype_values[]; |
