X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..eee3565979933af707c711411001ba11fe406a3c:/bsd/net/etherdefs.h?ds=sidebyside

diff --git a/bsd/net/etherdefs.h b/bsd/net/etherdefs.h
index cd56710f9..82ac3713f 100644
--- a/bsd/net/etherdefs.h
+++ b/bsd/net/etherdefs.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * Mach Operating System
@@ -46,12 +52,18 @@
  */
 #ifndef _ETHERDEFS_
 #define _ETHERDEFS_
+#include <sys/appleapiopts.h>
+#if !defined(KERNEL) || defined(__APPLE_API_OBSOLETE)
+
+#include <net/ethernet.h>
+#warning net/etherdefs.h is obsolete! Use net/ethernet.h
 
 #include	<netinet/if_ether.h>
+
 /*
  * Ethernet address - 6 octets
  */
-#define NUM_EN_ADDR_BYTES	6
+#define NUM_EN_ADDR_BYTES	ETHER_ADDR_LEN
 
 
 typedef struct ether_addr enet_addr_t;
@@ -60,10 +72,10 @@ typedef struct ether_header ether_header_t;
 
 #define IFTYPE_ETHERNET "10MB Ethernet"
 
-#define ETHERHDRSIZE	14
-#define ETHERMAXPACKET	(ETHERHDRSIZE + ETHERMTU)
-#define ETHERMINPACKET	64
-#define ETHERCRC	4
+#define ETHERHDRSIZE	ETHER_HDR_LEN
+#define ETHERMAXPACKET	ETHER_MAX_LEN
+#define ETHERMINPACKET	ETHER_MIN_LEN
+#define ETHERCRC	ETHER_CRC_LEN
 
 /*
  * Byte and bit in an enet_addr_t defining individual/group destination.
@@ -72,4 +84,5 @@ typedef struct ether_header ether_header_t;
 #define EA_GROUP_BIT	0x01
 
 
+#endif /* KERNEL && !__APPLE_API_OBSOLETE */
 #endif /* _ETHERDEFS_ */