xnu-1699.22.81.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 479561488a5ded588d519ccd8aab78861e8902af..e12a0e0ef5b4550a39b77b773193248014c94812 100644 (file)
--- a/bsd/net/ndrv_var.h
+++ b/bsd/net/ndrv_var.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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 */
 /*
@@ -38,7 +43,7 @@
 struct ndrv_multiaddr
 {
     struct ndrv_multiaddr*     next;
-    struct if_multiaddr*       ifma;
+    ifmultiaddr_t                      ifma;
     struct sockaddr                    addr;
 };
 
@@ -58,8 +63,8 @@ struct ndrv_cb
        int nd_descrcnt;                /* # elements in nd_dlist - Obsolete */
        TAILQ_HEAD(dlist, dlil_demux_desc) nd_dlist; /* Descr. list */
        struct ifnet *nd_if; /* obsolete, maintained for binary compatibility */
-    u_long     nd_proto_family;
-    u_long     nd_family;
+    u_int32_t  nd_proto_family;
+    u_int32_t  nd_family;
     struct ndrv_multiaddr*     nd_multiaddrs;
     short      nd_unit;
 };