Deleted Added
full compact
ethertype.h (214478) ethertype.h (235530)
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

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

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.30 2008-02-06 10:47:53 guy Exp $ (LBL)
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

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

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.30 2008-02-06 10:47:53 guy Exp $ (LBL)
22 * $FreeBSD: head/contrib/tcpdump/ethertype.h 214478 2010-10-28 19:06:17Z rpaulo $
22 * $FreeBSD: head/contrib/tcpdump/ethertype.h 235530 2012-05-17 05:11:57Z delphij $
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

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

99#define ETHERTYPE_ATALK 0x809b
100#endif
101#ifndef ETHERTYPE_AARP
102#define ETHERTYPE_AARP 0x80f3
103#endif
104#ifndef ETHERTYPE_8021Q
105#define ETHERTYPE_8021Q 0x8100
106#endif
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

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

99#define ETHERTYPE_ATALK 0x809b
100#endif
101#ifndef ETHERTYPE_AARP
102#define ETHERTYPE_AARP 0x80f3
103#endif
104#ifndef ETHERTYPE_8021Q
105#define ETHERTYPE_8021Q 0x8100
106#endif
107
108/* see:
109 http://en.wikipedia.org/wiki/IEEE_802.1Q
110 and http://en.wikipedia.org/wiki/QinQ
111*/
112#ifndef ETHERTYPE_8021Q9100
113#define ETHERTYPE_8021Q9100 0x9100
114#endif
115#ifndef ETHERTYPE_8021Q9200
116#define ETHERTYPE_8021Q9200 0x9200
117#endif
118#ifndef ETHERTYPE_8021QinQ
119#define ETHERTYPE_8021QinQ 0x88a8
120#endif
107#ifndef ETHERTYPE_IPX
108#define ETHERTYPE_IPX 0x8137
109#endif
110#ifndef ETHERTYPE_IPV6
111#define ETHERTYPE_IPV6 0x86dd
112#endif
113#ifndef ETHERTYPE_PPP
114#define ETHERTYPE_PPP 0x880b

--- 54 unchanged lines hidden ---
121#ifndef ETHERTYPE_IPX
122#define ETHERTYPE_IPX 0x8137
123#endif
124#ifndef ETHERTYPE_IPV6
125#define ETHERTYPE_IPV6 0x86dd
126#endif
127#ifndef ETHERTYPE_PPP
128#define ETHERTYPE_PPP 0x880b

--- 54 unchanged lines hidden ---