about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-03-29 09:24:03 +0000
committerUlrich Drepper <drepper@redhat.com>2003-03-29 09:24:03 +0000
commitea473bad4c98d8e36cd510ba117d8fd7ab623c85 (patch)
tree3cab8a02ee38c0ba230236be0147961102029070 /sysdeps/unix
parentcc4f0dde8880d12a99e470b51e788bd575ec17c5 (diff)
downloadglibc-ea473bad4c98d8e36cd510ba117d8fd7ab623c85.tar.gz
glibc-ea473bad4c98d8e36cd510ba117d8fd7ab623c85.tar.xz
glibc-ea473bad4c98d8e36cd510ba117d8fd7ab623c85.zip
Update.
2003-03-29  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs): Avoid
	netlink_open calls if netlink is known to not be available.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/ifaddrs.c12
1 files changed, 8 insertions, 4 deletions
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;