NTP: Use tstr for truncation indicator.

[tcpdump] / ether.h

diff --git a/ether.h b/ether.h
index 3e0ebb195fda9a73d2ae21929b824cd23f5b81e8..64916789782d30804e91db91b4c7637dd5584376 100644 (file)
--- a/ether.h
+++ b/ether.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ether.h,v 1.7 2002-11-09 17:19:18 itojun Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -42,18 +41,17 @@
 #define        ETHER_ADDR_LEN          6
 
 /*
- * Structure of a DEC/Intel/Xerox or 802.3 Ethernet header.
+ * Structure of an Ethernet header.
  */
 struct ether_header {
-       u_int8_t        ether_dhost[ETHER_ADDR_LEN];
-       u_int8_t        ether_shost[ETHER_ADDR_LEN];
-       u_int16_t       ether_type;
-} __attribute__((packed));
+       uint8_t         ether_dhost[ETHER_ADDR_LEN];
+       uint8_t         ether_shost[ETHER_ADDR_LEN];
+       uint16_t        ether_length_type;
+};
 
 /*
- * 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.
+ * Length of an 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.
  */
 #define ETHER_HDRLEN           14