X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..2d21ac55c334faf3a56e5634905ed6987fc787d4:/bsd/net/ndrv.h

diff --git a/bsd/net/ndrv.h b/bsd/net/ndrv.h
index 0824dafca..5a1feb1f5 100644
--- a/bsd/net/ndrv.h
+++ b/bsd/net/ndrv.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@
  */
 /* Copyright (c) 1997, 1998 Apple Computer, Inc. All Rights Reserved */
 /*
@@ -42,9 +48,9 @@ struct sockaddr_ndrv
  * Support for user-mode protocol handlers
  */
 
-#define NDRV_DEMUXTYPE_ETHERTYPE	DLIL_DESC_ETYPE2
-#define	NDRV_DEMUXTYPE_SAP			DLIL_DESC_SAP
-#define NDRV_DEMUXTYPE_SNAP			DLIL_DESC_SNAP
+#define NDRV_DEMUXTYPE_ETHERTYPE	4
+#define	NDRV_DEMUXTYPE_SAP			5
+#define NDRV_DEMUXTYPE_SNAP			6
 
 #define	NDRVPROTO_NDRV				0
 
@@ -114,10 +120,22 @@ struct ndrv_protocol_desc
     struct ndrv_demux_desc*	demux_list;
 };
 
+#ifdef KERNEL_PRIVATE
+/* LP64 version of ndrv_protocol_desc.  all pointers 
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with ndrv_protocol_desc
+ */
+struct ndrv_protocol_desc64 {
+    u_int32_t				version;
+    u_int32_t				protocol_family;
+    u_int32_t				demux_count;
+    user_addr_t				demux_list __attribute__((aligned(8)));
+};
+
+#endif // KERNEL_PRIVATE
+
 #define SOL_NDRVPROTO		NDRVPROTO_NDRV	/* Use this socket level */
-/*		NDRV_DMXSPEC		0x01		   	   Obsolete */
 #define NDRV_DELDMXSPEC		0x02			/* Delete the registered protocol */
-/*		NDRV_DMXSPECCNT		0x03			   Obsolete */
 #define NDRV_SETDMXSPEC		0x04			/* Set the protocol spec */
 #define	NDRV_ADDMULTICAST	0x05			/* Add a physical multicast address */
 #define NDRV_DELMULTICAST	0x06			/* Delete a phyiscal multicast */
@@ -145,11 +163,4 @@ struct ndrv_protocol_desc
  * you a second or two.
  */
 
-#ifdef KERNEL
-#ifdef __APPLE_API_UNSTABLE
-/* Additional Kernel APIs */
-struct ifnet*	ndrv_get_ifp(caddr_t ndrv_pcb);
-#endif /* __APPLE_API_UNSTABLE */
-#endif
-
 #endif	/* _NET_NDRV_H */