xnu-1699.22.73.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 4208380cf77dcdfa8517ada3e5276664c21ee28b..a17921f570cfadbeaa53db7233dbb47629e04ed3 100644 (file)
--- a/bsd/net/net_osdep.h
+++ b/bsd/net/net_osdep.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -244,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.
  *     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
  *     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


@@ -267,11 +268,6 @@ extern const char *if_name(struct ifnet *);
 #define if_addrlist    if_addrhead
 #define if_list                if_link
 
 #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 */
 #define WITH_CONVERT_AND_STRIP_IP_LEN
 
 #if 1                          /* at this moment, all OSes do this */