diff options
author | sam <sam@FreeBSD.org> | 2006-09-04 20:25:04 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2006-09-04 20:25:04 +0000 |
commit | a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d (patch) | |
tree | f2c7f7e1286aabfb28d9294895c2ffe8abac34a0 /contrib/tcpdump/ethertype.h | |
parent | 6bf6a28af37230c5ca61c232f2749a46397da00a (diff) | |
download | FreeBSD-src-a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d.zip FreeBSD-src-a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d.tar.gz |
resolve merge conflicts
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
-rw-r--r-- | contrib/tcpdump/ethertype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index 808cdcf..1555b4d 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -19,7 +19,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * - * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24 2004/10/07 16:04:07 hannes Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24.2.1 2005/07/10 14:51:10 hannes Exp $ (LBL) * $FreeBSD$ */ @@ -111,6 +111,9 @@ #ifndef ETHERTYPE_PPP #define ETHERTYPE_PPP 0x880b #endif +#ifndef ETHERTYPE_SLOW +#define ETHERTYPE_SLOW 0x8809 +#endif #ifndef ETHERTYPE_MPLS #define ETHERTYPE_MPLS 0x8847 #endif |