From ea473bad4c98d8e36cd510ba117d8fd7ab623c85 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 29 Mar 2003 09:24:03 +0000 Subject: Update. 2003-03-29 Ulrich Drepper * sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs): Avoid netlink_open calls if netlink is known to not be available. --- sysdeps/unix/sysv/linux/ifaddrs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c index 3921c40dc7..f4f8606892 100644 --- a/sysdeps/unix/sysv/linux/ifaddrs.c +++ b/sysdeps/unix/sysv/linux/ifaddrs.c @@ -43,9 +43,13 @@ #if __ASSUME_NETLINK_SUPPORT == 0 static int no_netlink_support; -#define getifaddrs fallback_getifaddrs -#include "sysdeps/gnu/ifaddrs.c" -#undef getifaddrs +# define getifaddrs fallback_getifaddrs +# include "sysdeps/gnu/ifaddrs.c" +# undef getifaddrs + +#else + +# define no_netlink_support 0 #endif @@ -292,7 +296,7 @@ getifaddrs (struct ifaddrs **ifap) if (ifap) *ifap = NULL; - if (netlink_open (&nh) < 0) + if (! no_netlink_support && netlink_open (&nh) < 0) { #if __ASSUME_NETLINK_SUPPORT == 0 no_netlink_support = 1; -- cgit v1.2.3