xnu-2050.24.15.tar.gz

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

diff --git a/bsd/net/net_osdep.h b/bsd/net/net_osdep.h
index 62fa8af8737c0f71cc661ebd909c6c85a4acb6ea..a17921f570cfadbeaa53db7233dbb47629e04ed3 100644 (file)
--- a/bsd/net/net_osdep.h
+++ b/bsd/net/net_osdep.h
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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.  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 
+ * 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
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -246,9 +244,10 @@
  *     NetBSD 1.5: always use IFAREF whenever reference gets added.
  *             always use IFAFREE whenever reference gets freed.
  *             IFAFREE frees ifaddr when ifa_refcnt reaches 0.
- *     Darwin: always use ifaref whenever reference gets added.
- *             always use ifafree whenever reference gets freed.
- *             ifaref and ifafree are responsible for determining when to free.
+ *     Darwin: always use IFA_ADDREF whenever reference gets added.
+ *             always use IFA_REMREF whenever reference gets freed.
+ *             IFA_ADDREF and IFA_REMREF are responsible for determining
+ *             when to free.
  *     others: do not increase refcnt for ifp->if_addrlist and in_ifaddr.
  *             use IFAFREE once when ifaddr is disconnected from
  *             ifp->if_addrlist and in_ifaddr.  IFAFREE frees ifaddr when
@@ -269,11 +268,6 @@ extern const char *if_name(struct ifnet *);
 #define if_addrlist    if_addrhead
 #define if_list                if_link
 
-/* sys/net/if.h */
-#ifndef __APPLE__
-#define IFAREF(ifa)    do { ++(ifa)->ifa_refcnt; } while (0)
-#endif
-
 #define WITH_CONVERT_AND_STRIP_IP_LEN
 
 #if 1                          /* at this moment, all OSes do this */