xnu-1699.22.81.tar.gz

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

diff --git a/bsd/net/ndrv.h b/bsd/net/ndrv.h
index 5a1feb1f50caeecfc2d1daa553acdf55fc0e2498..7e9fc970083be34f22ec1c523e3bbabc29fd2df9 100644 (file)
--- a/bsd/net/ndrv.h
+++ b/bsd/net/ndrv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -107,17 +107,17 @@ struct ndrv_demux_desc
  *   Used to "bind" an NDRV socket so that packets that match
  *   given protocol demux descriptions can be received:
  * Field:
- *             version                 :       must be NDRV_PROTOCOL_DESC_VERS
- *             protocol_family :       unique identifier for this protocol
- *             demux_count             :       number of demux_list descriptors in demux_list
- *             demux_list              :       pointer to array of demux descriptors
+ *     version         :       must be NDRV_PROTOCOL_DESC_VERS
+ *     protocol_family :       unique identifier for this protocol
+ *     demux_count     :       number of demux_list descriptors in demux_list; maximum of 10
+ *     demux_list      :       pointer to array of demux descriptors
  */
 struct ndrv_protocol_desc
 {
     u_int32_t                          version;
     u_int32_t                          protocol_family;
     u_int32_t                          demux_count;
-    struct ndrv_demux_desc*    demux_list;
+    struct ndrv_demux_desc             *demux_list;
 };
 
 #ifdef KERNEL_PRIVATE
@@ -129,10 +129,16 @@ 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)));
+    user64_addr_t                      demux_list __attribute__((aligned(8)));
 };
 
-#endif // KERNEL_PRIVATE
+struct ndrv_protocol_desc32 {
+    u_int32_t                          version;
+    u_int32_t                          protocol_family;
+    u_int32_t                          demux_count;
+    user32_addr_t                      demux_list;
+};
+#endif /* KERNEL_PRIVATE */
 
 #define SOL_NDRVPROTO          NDRVPROTO_NDRV  /* Use this socket level */
 #define NDRV_DELDMXSPEC                0x02                    /* Delete the registered protocol */