xnu-4903.241.1.tar.gz

[apple/xnu.git] / bsd / net / ethernet.h

diff --git a/bsd/net/ethernet.h b/bsd/net/ethernet.h
index 00b7fa5fb8358c6a6c56c7bae62c05cbc68f2668..23719456b1d00f396caea0f4f7bd4d6cbba3c23b 100644 (file)
--- a/bsd/net/ethernet.h
+++ b/bsd/net/ethernet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000,2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -65,6 +65,14 @@
  */
 #define        ETHER_MAX_LEN           1518
 
+/*
+ * Mbuf adjust factor to force 32-bit alignment of IP header.
+ * Drivers should do m_adj(m, ETHER_ALIGN) when setting up a
+ * receive so the upper layers get the IP header properly aligned
+ * past the 14-byte Ethernet header.
+ */
+#define ETHER_ALIGN             2       /* driver adjust for IP hdr alignment */
+
 /*
  * A macro to validate a length with
  */
@@ -74,18 +82,18 @@
 /*
  * Structure of a 10Mb/s Ethernet header.
  */
-struct ether_header {
+typedef struct ether_header {
        u_char  ether_dhost[ETHER_ADDR_LEN];
        u_char  ether_shost[ETHER_ADDR_LEN];
        u_short ether_type;
-};
+} ether_header_t;
 
 /*
  * Structure of a 48-bit Ethernet address.
  */
-struct ether_addr {
+typedef struct ether_addr {
        u_char octet[ETHER_ADDR_LEN];
-};
+} ether_addr_t;
 
 #define ether_addr_octet octet
 
@@ -97,6 +105,7 @@ struct       ether_addr {
 #define ETHERTYPE_IPV6         0x86dd  /* IPv6 */
 #define ETHERTYPE_PAE          0x888e  /* EAPOL PAE/802.1x */
 #define ETHERTYPE_RSN_PREAUTH  0x88c7  /* 802.11i / RSN Pre-Authentication */
+#define ETHERTYPE_PTP          0x88f7  /* IEEE 1588 Precision Time Protocol */
 #define        ETHERTYPE_LOOPBACK      0x9000  /* used to test interfaces */
 /* XXX - add more useful types here */
 
@@ -120,7 +129,35 @@ struct     ether_addr *ether_aton(const char *);
 
 #ifdef BSD_KERNEL_PRIVATE
 extern u_char  etherbroadcastaddr[ETHER_ADDR_LEN];
-#endif
+
+#if defined (__arm__)
+
+#include <string.h>
+
+static __inline__ int
+_ether_cmp(const void * a, const void * b)
+{
+       return (memcmp(a, b, ETHER_ADDR_LEN));
+}
+
+#else /* __arm__ */
+
+static __inline__ int
+_ether_cmp(const void * a, const void * b)
+{
+       const u_int16_t * a_s = (const u_int16_t *)a;
+       const u_int16_t * b_s = (const u_int16_t *)b;
+       
+       if (a_s[0] != b_s[0]
+               || a_s[1] != b_s[1]
+               || a_s[2] != b_s[2]) {
+               return (1);
+       }
+       return (0);
+}
+
+#endif /* __arm__ */
+#endif /* BSD_KERNEL_PRIVATE */
 
 #define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */