xnu-2050.7.9.tar.gz

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

diff --git a/bsd/net/ndrv_var.h b/bsd/net/ndrv_var.h
index dd00bbeb2a53b4602cb4b3cc76eec4157a2ad56c..c2c2085954c6dc7d19a2b7d2f20bb7b2b7ffba82 100644 (file)
--- a/bsd/net/ndrv_var.h
+++ b/bsd/net/ndrv_var.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * 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
  * 
  * 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
  * 
  * 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.
  * 
  * 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 */
 /*
  */
 /* Copyright (c) 1997, 1998 Apple Computer, Inc. All Rights Reserved */
 /*


@@ -30,9 +33,7 @@
 
 #ifndef _NET_NDRV_VAR_H
 #define _NET_NDRV_VAR_H
 
 #ifndef _NET_NDRV_VAR_H
 #define _NET_NDRV_VAR_H

-#include <sys/appleapiopts.h>
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef PRIVATE

 
 /*
  * structure for storing a linked list of multicast addresses
 
 /*
  * structure for storing a linked list of multicast addresses


@@ -42,6 +43,7 @@
 struct ndrv_multiaddr
 {
     struct ndrv_multiaddr*     next;
 struct ndrv_multiaddr
 {
     struct ndrv_multiaddr*     next;

+    ifmultiaddr_t                      ifma;

     struct sockaddr                    addr;
 };
 
     struct sockaddr                    addr;
 };
 


@@ -52,8 +54,7 @@ struct ndrv_multiaddr
  */
 struct ndrv_cb
 {
  */
 struct ndrv_cb
 {

-    struct ndrv_cb *nd_next;   /* Doubly-linked list */
-       struct ndrv_cb *nd_prev;
+       TAILQ_ENTRY(ndrv_cb)    nd_next;

        struct socket *nd_socket;       /* Back to the socket */
        u_int32_t nd_signature; /* Just double-checking */
        struct sockaddr_ndrv *nd_faddr;
        struct socket *nd_socket;       /* Back to the socket */
        u_int32_t nd_signature; /* Just double-checking */
        struct sockaddr_ndrv *nd_faddr;


@@ -61,12 +62,12 @@ struct ndrv_cb
        struct sockproto nd_proto;      /* proto family, protocol */
        int nd_descrcnt;                /* # elements in nd_dlist - Obsolete */
        TAILQ_HEAD(dlist, dlil_demux_desc) nd_dlist; /* Descr. list */
        struct sockproto nd_proto;      /* proto family, protocol */
        int nd_descrcnt;                /* # elements in nd_dlist - Obsolete */
        TAILQ_HEAD(dlist, dlil_demux_desc) nd_dlist; /* Descr. list */

+       u_int32_t nd_dlist_cnt; /* Descr. list count */

        struct ifnet *nd_if; /* obsolete, maintained for binary compatibility */
        struct ifnet *nd_if; /* obsolete, maintained for binary compatibility */

-    u_long     nd_send_tag;
-    u_long     nd_tag;
-    u_long     nd_family;
-    struct ndrv_multiaddr*     nd_multiaddrs;
-    short      nd_unit;
+       u_int32_t nd_proto_family;
+       u_int32_t nd_family;
+       struct ndrv_multiaddr* nd_multiaddrs;
+       short nd_unit;

 };
 
 #define        sotondrvcb(so)          ((struct ndrv_cb *)(so)->so_pcb)
 };
 
 #define        sotondrvcb(so)          ((struct ndrv_cb *)(so)->so_pcb)


@@ -76,7 +77,5 @@ struct ndrv_cb
 #define NDRVSNDQ        8192
 #define NDRVRCVQ        8192
 
 #define NDRVSNDQ        8192
 #define NDRVRCVQ        8192
 

-extern struct ndrv_cb ndrvl;           /* Head of controlblock list */
-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+#endif /* PRIVATE */

 #endif /* _NET_NDRV_VAR_H */
 #endif /* _NET_NDRV_VAR_H */