xnu-4570.51.1.tar.gz

[apple/xnu.git] / bsd / netinet / if_ether.h

diff --git a/bsd/netinet/if_ether.h b/bsd/netinet/if_ether.h
index 6e80296e8512399deb9a0632aa8b2cf61a74216e..9ed719225ee730ad29c6693c4a06ed06853ac5be 100644 (file)
--- a/bsd/netinet/if_ether.h
+++ b/bsd/netinet/if_ether.h
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * @APPLE_LICENSE_OSREFERENCE_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. 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.
  * 
- * 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.  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 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * 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_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -134,7 +132,8 @@ struct sockaddr_inarp {
        struct  in_addr sin_srcaddr;
        u_short sin_tos;
        u_short sin_other;
-#define SIN_PROXY 1
+#define        SIN_PROXY       0x1
+#define        SIN_ROUTER      0x2
 };
 /*
  * IP and ethernet specific routing flags
@@ -142,7 +141,7 @@ struct sockaddr_inarp {
 #define        RTF_USETRAILERS RTF_PROTO1      /* use trailers */
 #define RTF_ANNOUNCE   RTF_PROTO2      /* announce new arp entry */
 
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 extern u_char  ether_ipmulticast_min[ETHER_ADDR_LEN];
 extern u_char  ether_ipmulticast_max[ETHER_ADDR_LEN];
 extern struct  ifqueue arpintrq;
@@ -150,6 +149,6 @@ extern struct       ifqueue arpintrq;
 int    arpresolve(struct ifnet *, struct rtentry *, struct mbuf *,
                        struct sockaddr *, u_char *, struct rtentry *);
 void   arp_ifinit(struct ifnet *, struct ifaddr *);
-#endif KERNEL_PRIVATE
+#endif /* BSD_KERNEL_PRIVATE */
 
-#endif _NETINET_IF_ETHER_H_
+#endif /* _NETINET_IF_ETHER_H_ */