X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7b50febe28e54e076a9917164eeddec4bc7a170e..refs/pull/433/head:/ether.h

diff --git a/ether.h b/ether.h
index 22170f47..58b92de5 100644
--- a/ether.h
+++ b/ether.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ether.h,v 1.2 2000-09-23 08:26:30 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,10 +33,6 @@
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
  */
 
-#if 0
-#include <net/if_arp.h>
-#endif
-
 #define	ETHERMTU	1500
 
 /*
@@ -46,17 +41,18 @@
 #define	ETHER_ADDR_LEN		6
 
 /*
- * Ethernet address - 6 octets
+ * Structure of a DEC/Intel/Xerox or 802.3 Ethernet header.
  */
-struct ether_addr {
-	u_char	ether_addr_octet[ETHER_ADDR_LEN];
+struct	ether_header {
+	uint8_t		ether_dhost[ETHER_ADDR_LEN];
+	uint8_t		ether_shost[ETHER_ADDR_LEN];
+	uint16_t	ether_type;
 };
 
 /*
- * Structure of a 10Mb/s Ethernet header.
+ * Length of a DEC/Intel/Xerox or 802.3 Ethernet header; note that some
+ * compilers may pad "struct ether_header" to a multiple of 4 bytes,
+ * for example, so "sizeof (struct ether_header)" may not give the right
+ * answer.
  */
-struct	ether_header {
-	u_char	ether_dhost[ETHER_ADDR_LEN];
-	u_char	ether_shost[ETHER_ADDR_LEN];
-	u_short	ether_type;
-};
+#define ETHER_HDRLEN		14