Revert "ip netns: Fix rtnl error while print netns list"

This reverts commit d116ff34145b00db54a37e2a6282dccd8bc08225.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

diff --git a/configure b/configure
index 631938e97206f93d82e4f1fc9967af475c1fcaf1..c3dacdba14ff3e9cd1c2d462c5e349d6f09b2b64 100755 (executable)
--- a/configure
+++ b/configure
@@ -201,7 +201,7 @@ check_setns()
 {
     cat >$TMPDIR/setnstest.c <<EOF
 #include <sched.h>
-int main(int argc, char **argv)
+int main(int argc, char **argv) 
 {
        (void)setns(0,0);
        return 0;
@@ -218,23 +218,6 @@ EOF
     rm -f $TMPDIR/setnstest.c $TMPDIR/setnstest
 }
 
-check_netnsid()
-{
-    cat >$TMPDIR/netnsid.c <<EOF
-#include <linux/rtnetlink.h>
-int test_def = RTM_GETNSID;
-EOF
-    $CC -c $TMPDIR/netnsid.c >/dev/null 2>&1
-    if [ $? -eq 0 ]
-    then
-       echo "IP_CONFIG_NETNSID:=y" >> Config
-       echo "yes"
-    else
-       echo "no"
-    fi
-    rm -f $TMPDIR/netnsid.c $TMPDIR/netnsid.o
-}
-
 check_ipset()
 {
     cat >$TMPDIR/ipsettest.c <<EOF
@@ -300,8 +283,6 @@ check_ipt_lib_dir
 
 echo -n "libc has setns: "
 check_setns
-echo -n "netns has peer id suport: "
-check_netnsid
 
 echo -n "SELinux support: "
 check_selinux

diff --git a/ip/Makefile b/ip/Makefile
index 5637bcfebde034b22fe3f87c9ba30d18112e0197..2c742f305fefaa244d5c9d1657c8699d8dd8225c 100644 (file)
--- a/ip/Makefile
+++ b/ip/Makefile
@@ -16,10 +16,6 @@ ifeq ($(IP_CONFIG_SETNS),y)
        CFLAGS += -DHAVE_SETNS
 endif
 
-ifeq ($(IP_CONFIG_NETNSID),y)
-       CFLAGS += -DHAVE_NETNSID
-endif
-
 ALLOBJ=$(IPOBJ) $(RTMONOBJ)
 SCRIPTS=ifcfg rtpr routel routef
 TARGETS=ip rtmon

diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index 45e234a4d98c287a102506196fafad76283cfe3b..5a213dcf46cd0b69f775bd5d213cc46c3fc35d43 100644 (file)
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -34,7 +34,6 @@ static int usage(void)
        exit(-1);
 }
 
-#ifdef HAVE_NETNSID
 static int get_netnsid_from_name(const char *name)
 {
        struct {
@@ -79,12 +78,6 @@ static int get_netnsid_from_name(const char *name)
 
        return -1;
 }
-#else
-static int get_netnsid_from_name(const char *name)
-{
-       return -1;
-}
-#endif /* HAVE_NETNSID */
 
 static int netns_list(int argc, char **argv)
 {