Deleted Added
full compact
ethertype.h (84019) ethertype.h (98527)
1/*
2 * Copyright (c) 1993, 1994, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
1/*
2 * Copyright (c) 1993, 1994, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.12 2000/09/23 08:03:30 guy Exp $ (LBL)
22 * $FreeBSD: head/contrib/tcpdump/ethertype.h 84019 2001-09-27 08:02:27Z julian $
21 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.16 2001/06/21 17:56:02 itojun Exp $ (LBL)
22 *
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 98527 2002-06-21 00:49:02Z fenner $
23 */
24
25/*
26 * Ethernet types.
27 *
28 * We wrap the declarations with #ifdef, so that if a file includes
29 * <netinet/if_ether.h>, which may declare some of these, we don't
30 * get a bunch of complaints from the C compiler about redefinitions

--- 62 unchanged lines hidden (view full) ---

93#endif
94#ifndef ETHERTYPE_AARP
95#define ETHERTYPE_AARP 0x80f3
96#endif
97#ifndef ETHERTYPE_8021Q
98#define ETHERTYPE_8021Q 0x8100
99#endif
100#ifndef ETHERTYPE_IPX
24 */
25
26/*
27 * Ethernet types.
28 *
29 * We wrap the declarations with #ifdef, so that if a file includes
30 * <netinet/if_ether.h>, which may declare some of these, we don't
31 * get a bunch of complaints from the C compiler about redefinitions

--- 62 unchanged lines hidden (view full) ---

94#endif
95#ifndef ETHERTYPE_AARP
96#define ETHERTYPE_AARP 0x80f3
97#endif
98#ifndef ETHERTYPE_8021Q
99#define ETHERTYPE_8021Q 0x8100
100#endif
101#ifndef ETHERTYPE_IPX
101#define ETHERTYPE_IPX 0x8137
102#define ETHERTYPE_IPX 0x8137
102#endif
103#ifndef ETHERTYPE_IPV6
104#define ETHERTYPE_IPV6 0x86dd
105#endif
103#endif
104#ifndef ETHERTYPE_IPV6
105#define ETHERTYPE_IPV6 0x86dd
106#endif
107#ifndef ETHERTYPE_PPP
108#define ETHERTYPE_PPP 0x880b
109#endif
110#ifndef ETHERTYPE_MPLS
111#define ETHERTYPE_MPLS 0x8847
112#endif
113#ifndef ETHERTYPE_MPLS_MULTI
114#define ETHERTYPE_MPLS_MULTI 0x8848
115#endif
106#ifndef ETHERTYPE_PPPOED
107#define ETHERTYPE_PPPOED 0x8863
108#endif
109#ifndef ETHERTYPE_PPPOES
110#define ETHERTYPE_PPPOES 0x8864
111#endif
112#ifndef ETHERTYPE_PPPOED2
113#define ETHERTYPE_PPPOED2 0x3c12
114#endif
115#ifndef ETHERTYPE_PPPOES2
116#define ETHERTYPE_PPPOES2 0x3c13
117#endif
118#ifndef ETHERTYPE_LOOPBACK
119#define ETHERTYPE_LOOPBACK 0x9000
120#endif
116#ifndef ETHERTYPE_PPPOED
117#define ETHERTYPE_PPPOED 0x8863
118#endif
119#ifndef ETHERTYPE_PPPOES
120#define ETHERTYPE_PPPOES 0x8864
121#endif
122#ifndef ETHERTYPE_PPPOED2
123#define ETHERTYPE_PPPOED2 0x3c12
124#endif
125#ifndef ETHERTYPE_PPPOES2
126#define ETHERTYPE_PPPOES2 0x3c13
127#endif
128#ifndef ETHERTYPE_LOOPBACK
129#define ETHERTYPE_LOOPBACK 0x9000
130#endif