diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ifaddrs.c | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 756e2b17c0..e299697d6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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. + 2003-03-29 Alexandre Oliva <aoliva@redhat.com> * configure.in: Add mips64* support. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0724d7214f..86d766f163 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2003-03-29 Ulrich Drepper <drepper@redhat.com> + + * Makefile (libpthread-routines): Add pthread_atfork. + (libpthread-static-only-routines): Add pthread_atfork. + 2003-03-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/tls.h: Include nptl/descr.h after the definition 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; |