xnu-6153.41.3.tar.gz

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

diff --git a/bsd/net/if_dl.h b/bsd/net/if_dl.h
index 1dd0d8c07f5b320f5da9ad6862cacdd089b13b7e..58f0a8954197d31324a14779bfb827323f52075f 100644 (file)
--- a/bsd/net/if_dl.h
+++ b/bsd/net/if_dl.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2011 Apple 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
@@ -11,10 +11,10 @@
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -65,6 +65,12 @@
 #define _NET_IF_DL_H_
 #include <sys/appleapiopts.h>
 
+#include <sys/types.h>
+
+#ifdef BSD_KERNEL_PRIVATE
+#define DLIL_SDLMAXLEN  64
+#endif /* BSD_KERNEL_PRIVATE */
+
 /*
  * A Link-Level Sockaddr may specify the interface in one of two
  * ways: either by means of a system-provided index number (computed
@@ -87,19 +93,19 @@
  * Structure of a Link-Level sockaddr:
  */
 struct sockaddr_dl {
-       u_char  sdl_len;        /* Total length of sockaddr */
-       u_char  sdl_family;     /* AF_LINK */
-       u_short sdl_index;      /* if != 0, system given index for interface */
-       u_char  sdl_type;       /* interface type */
-       u_char  sdl_nlen;       /* interface name length, no trailing 0 reqd. */
-       u_char  sdl_alen;       /* link level address length */
-       u_char  sdl_slen;       /* link layer selector length */
-       char    sdl_data[12];   /* minimum work area, can be larger;
-                                  contains both if name and ll address */
+       u_char  sdl_len;        /* Total length of sockaddr */
+       u_char  sdl_family;     /* AF_LINK */
+       u_short sdl_index;      /* if != 0, system given index for interface */
+       u_char  sdl_type;       /* interface type */
+       u_char  sdl_nlen;       /* interface name length, no trailing 0 reqd. */
+       u_char  sdl_alen;       /* link level address length */
+       u_char  sdl_slen;       /* link layer selector length */
+       char    sdl_data[12];   /* minimum work area, can be larger;
+                                *  contains both if name and ll address */
 #ifndef __APPLE__
        /* For TokenRing */
-       u_short sdl_rcf;        /* source routing control */
-       u_short sdl_route[16];  /* source routing information */
+       u_short sdl_rcf;        /* source routing control */
+       u_short sdl_route[16];  /* source routing information */
 #endif
 };
 
@@ -109,7 +115,7 @@ struct sockaddr_dl {
 #endif
 
 #ifdef BSD_KERNEL_PRIVATE
-#define SDL(s) ((struct sockaddr_dl *)s)
+#define SDL(s) ((struct sockaddr_dl *)(void *)s)
 #endif
 
 #ifndef KERNEL
@@ -117,8 +123,8 @@ struct sockaddr_dl {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void   link_addr(const char *, struct sockaddr_dl *);
-char   *link_ntoa(const struct sockaddr_dl *);
+void    link_addr(const char *, struct sockaddr_dl *);
+char    *link_ntoa(const struct sockaddr_dl *);
 __END_DECLS
 
 #endif /* !KERNEL */