svn commit: trunk/uClibc/libc/inet

[ricardw at uclibc.org]

Author: ricardw
Date: 2008-10-28 02:55:44 -0700 (Tue, 28 Oct 2008)
New Revision: 23829

Log:
Remove all references to __no_netlink_support as after thurough scrutiny of 
the code it was never used in any useful way.

Modified:
   trunk/uClibc/libc/inet/ifaddrs.c
   trunk/uClibc/libc/inet/netlinkaccess.h


Changeset:
Modified: trunk/uClibc/libc/inet/ifaddrs.c
===================================================================
--- trunk/uClibc/libc/inet/ifaddrs.c	2008-10-28 09:40:28 UTC (rev 23828)
+++ trunk/uClibc/libc/inet/ifaddrs.c	2008-10-28 09:55:44 UTC (rev 23829)
@@ -308,9 +308,6 @@
     close_and_out:
       __netlink_close (h);
     out:
-#if __ASSUME_NETLINK_SUPPORT == 0
-      __no_netlink_support = 1;
-#endif
       return -1;
     }
   /* Determine the ID the kernel assigned for this netlink connection.
@@ -374,18 +371,11 @@
   if (ifap)
     *ifap = NULL;
 
-  if (! __no_netlink_support && __netlink_open (&nh) < 0)
+  if (__netlink_open (&nh) < 0)
     {
-#if __ASSUME_NETLINK_SUPPORT != 0
       return -1;
-#endif
     }
 
-#if __ASSUME_NETLINK_SUPPORT == 0
-  if (__no_netlink_support)
-    return fallback_getifaddrs (ifap);
-#endif
-
   /* Tell the kernel that we wish to get a list of all
      active interfaces, collect all data for every interface.  */
   if (__netlink_request (&nh, RTM_GETLINK) < 0)
@@ -864,13 +854,11 @@
 }
 
 
-#if __ASSUME_NETLINK_SUPPORT != 0
 void
 freeifaddrs (struct ifaddrs *ifa)
 {
   free (ifa);
 }
-#endif
 
 #endif /* __UCLIBC_SUPPORT_AI_ADDRCONFIG__ */
 

Modified: trunk/uClibc/libc/inet/netlinkaccess.h
===================================================================
--- trunk/uClibc/libc/inet/netlinkaccess.h	2008-10-28 09:40:28 UTC (rev 23828)
+++ trunk/uClibc/libc/inet/netlinkaccess.h	2008-10-28 09:55:44 UTC (rev 23829)
@@ -57,16 +57,6 @@
 #define __ASSUME_NETLINK_SUPPORT 1
 #endif
 
-#ifdef __UCLIBC_SUPPORT_AI_ADDRCONFIG__
-#if __ASSUME_NETLINK_SUPPORT == 0
-/* suspicious: This will simply not work.. */
-extern smallint __no_netlink_support attribute_hidden;
-#else
-# define __no_netlink_support 0
-#endif
-#endif /* __UCLIBC_SUPPORT_AI_ADDRCONFIG__ */
-
-
 extern int __netlink_open (struct netlink_handle *h) attribute_hidden;
 extern void __netlink_close (struct netlink_handle *h) attribute_hidden;
 extern void __netlink_free_handle (struct netlink_handle *h) attribute_hidden;