xnu-1228.tar.gz

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

diff --git a/bsd/net/ndrv.h b/bsd/net/ndrv.h
index d8c9a492839d0a687f9ae8be574a32957ce6d21d..5a1feb1f50caeecfc2d1daa553acdf55fc0e2498 100644 (file)
--- a/bsd/net/ndrv.h
+++ b/bsd/net/ndrv.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, 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@
  */
 /* Copyright (c) 1997, 1998 Apple Computer, Inc. All Rights Reserved */
 /*
@@ -45,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
 
@@ -117,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 */
@@ -148,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 */