Deleted Added
full compact
ethertype.h (146778) ethertype.h (162021)
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 *
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 *
22 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24 2004/10/07 16:04:07 hannes Exp $ (LBL)
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 146778 2005-05-29 19:09:28Z sam $
22 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24.2.1 2005/07/10 14:51:10 hannes Exp $ (LBL)
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 162021 2006-09-04 20:25:04Z sam $
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

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

106#define ETHERTYPE_IPX 0x8137
107#endif
108#ifndef ETHERTYPE_IPV6
109#define ETHERTYPE_IPV6 0x86dd
110#endif
111#ifndef ETHERTYPE_PPP
112#define ETHERTYPE_PPP 0x880b
113#endif
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

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

106#define ETHERTYPE_IPX 0x8137
107#endif
108#ifndef ETHERTYPE_IPV6
109#define ETHERTYPE_IPV6 0x86dd
110#endif
111#ifndef ETHERTYPE_PPP
112#define ETHERTYPE_PPP 0x880b
113#endif
114#ifndef ETHERTYPE_SLOW
115#define ETHERTYPE_SLOW 0x8809
116#endif
114#ifndef ETHERTYPE_MPLS
115#define ETHERTYPE_MPLS 0x8847
116#endif
117#ifndef ETHERTYPE_MPLS_MULTI
118#define ETHERTYPE_MPLS_MULTI 0x8848
119#endif
120#ifndef ETHERTYPE_PPPOED
121#define ETHERTYPE_PPPOED 0x8863

--- 27 unchanged lines hidden ---
117#ifndef ETHERTYPE_MPLS
118#define ETHERTYPE_MPLS 0x8847
119#endif
120#ifndef ETHERTYPE_MPLS_MULTI
121#define ETHERTYPE_MPLS_MULTI 0x8848
122#endif
123#ifndef ETHERTYPE_PPPOED
124#define ETHERTYPE_PPPOED 0x8863

--- 27 unchanged lines hidden ---