add AES and SHA2-*

[tcpdump] / ether.h

diff --git a/ether.h b/ether.h
index 44081680ca4189d50c772c934a0ea6d836873bdf..c68f25c089ce0c63a9874481c5bad8923c7355e5 100644 (file)
--- a/ether.h
+++ b/ether.h
@@ -1,3 +1,4 @@
+/* @(#) $Header: /tcpdump/master/tcpdump/ether.h,v 1.4 2000-10-03 02:54:55 itojun Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -33,10 +34,6 @@
  *     @(#)if_ether.h  8.3 (Berkeley) 5/2/95
  */
 
-#if 0
-#include <net/if_arp.h>
-#endif
-
 #define        ETHERMTU        1500
 
 /*
@@ -48,14 +45,14 @@
  * Ethernet address - 6 octets
  */
 struct ether_addr {
-       u_char  ether_addr_octet[ETHER_ADDR_LEN];
+       u_int8_t        ether_addr_octet[ETHER_ADDR_LEN];
 };
 
 /*
  * Structure of a 10Mb/s Ethernet header.
  */
 struct ether_header {
-       u_char  ether_dhost[ETHER_ADDR_LEN];
-       u_char  ether_shost[ETHER_ADDR_LEN];
-       u_short ether_type;
+       u_int8_t        ether_dhost[ETHER_ADDR_LEN];
+       u_int8_t        ether_shost[ETHER_ADDR_LEN];
+       u_int16_t       ether_type;
 };