diff options
| author | Ricard Wanderlof <ricard.wanderlof@axis.com> | 2008-10-28 09:55:44 +0000 |
|---|---|---|
| committer | Ricard Wanderlof <ricard.wanderlof@axis.com> | 2008-10-28 09:55:44 +0000 |
| commit | d403c9f1507bd2369b36d8aac63aea1ed3ffe04e (patch) | |
| tree | 957679e3b3b465eb711859411c7f33d9e78e3202 /libc/inet | |
| parent | 7d602faf7652cbd8358ff90a9eaa53ac5230dabe (diff) | |
Remove all references to __no_netlink_support as after thurough scrutiny of
the code it was never used in any useful way.
Diffstat (limited to 'libc/inet')
| -rw-r--r-- | libc/inet/ifaddrs.c | 14 | ||||
| -rw-r--r-- | libc/inet/netlinkaccess.h | 10 |
2 files changed, 1 insertions, 23 deletions
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c index c60dcf76d..775d311d4 100644 --- a/libc/inet/ifaddrs.c +++ b/libc/inet/ifaddrs.c @@ -308,9 +308,6 @@ __netlink_open (struct netlink_handle *h) 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 @@ getifaddrs (struct ifaddrs **ifap) 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 @@ getifaddrs (struct ifaddrs **ifap) } -#if __ASSUME_NETLINK_SUPPORT != 0 void freeifaddrs (struct ifaddrs *ifa) { free (ifa); } -#endif #endif /* __UCLIBC_SUPPORT_AI_ADDRCONFIG__ */ diff --git a/libc/inet/netlinkaccess.h b/libc/inet/netlinkaccess.h index e4e4a127b..5111d3802 100644 --- a/libc/inet/netlinkaccess.h +++ b/libc/inet/netlinkaccess.h @@ -57,16 +57,6 @@ struct netlink_handle #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; |