X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/10afb02ac804db7fa41a776fd61eff922c09c4df..febd0bc5aa33b3de9b5864e8c5565fe7b63f519f:/ether.h diff --git a/ether.h b/ether.h index 3e0ebb19..64916789 100644 --- 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