X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..7ee9d059c4eecf68ae4f8b0fb99ae2471eda79af:/bsd/net/ethernet.h

diff --git a/bsd/net/ethernet.h b/bsd/net/ethernet.h
index 86f3152b9..aea52bc20 100644
--- a/bsd/net/ethernet.h
+++ b/bsd/net/ethernet.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Fundamental constants relating to ethernet.
@@ -30,6 +33,7 @@
 #ifndef _NET_ETHERNET_H_
 #define _NET_ETHERNET_H_
 #include <sys/appleapiopts.h>
+#include <sys/types.h>		/* u_ types */
 
 /*
  * The number of bytes in an ethernet (MAC) address.
@@ -61,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
  */
@@ -91,6 +103,8 @@ struct	ether_addr {
 #define ETHERTYPE_REVARP	0x8035	/* reverse Addr. resolution protocol */
 #define	ETHERTYPE_VLAN		0x8100	/* IEEE 802.1Q VLAN tagging */
 #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_LOOPBACK	0x9000	/* used to test interfaces */
 /* XXX - add more useful types here */
 
@@ -105,11 +119,36 @@ struct	ether_addr {
 #define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
 #define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
-struct	ether_addr *ether_aton __P((char *));
-#endif /* __APPLE_API_PRIVATE */
-#endif
+#ifdef KERNEL_PRIVATE
+/*
+ * The following are used by ethernet interfaces.
+ */
+
+struct	ether_addr *ether_aton(const char *);
+
+#ifdef BSD_KERNEL_PRIVATE
+extern u_char	etherbroadcastaddr[ETHER_ADDR_LEN];
+
+
+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 /* BSD_KERNEL_PRIVATE */
+
+#define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */
+
+#endif /* KERNEL_PRIVATE */
 
 #ifndef KERNEL
 #include <sys/cdefs.h>
@@ -119,10 +158,11 @@ struct	ether_addr *ether_aton __P((char *));
  */
 __BEGIN_DECLS
 
-int	ether_hostton __P((char *, struct ether_addr *));
-int	ether_line __P((char *, struct ether_addr *, char *));
-char 	*ether_ntoa __P((struct ether_addr *));
-int	ether_ntohost __P((char *, struct ether_addr *));
+int	ether_hostton(const char *, struct ether_addr *);
+int	ether_line(const char *, struct ether_addr *, char *);
+char 	*ether_ntoa(const struct ether_addr *);
+struct	ether_addr *ether_aton(const char *);
+int	ether_ntohost(char *, const struct ether_addr *);
 __END_DECLS
 #endif /* !KERNEL */