Commit 5a2ce868 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Stephen Hemminger

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

This reverts commit d116ff34.
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
parent 694ed195
...@@ -201,7 +201,7 @@ check_setns() ...@@ -201,7 +201,7 @@ check_setns()
{ {
cat >$TMPDIR/setnstest.c <<EOF cat >$TMPDIR/setnstest.c <<EOF
#include <sched.h> #include <sched.h>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
(void)setns(0,0); (void)setns(0,0);
return 0; return 0;
...@@ -218,23 +218,6 @@ EOF ...@@ -218,23 +218,6 @@ EOF
rm -f $TMPDIR/setnstest.c $TMPDIR/setnstest 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() check_ipset()
{ {
cat >$TMPDIR/ipsettest.c <<EOF cat >$TMPDIR/ipsettest.c <<EOF
...@@ -300,8 +283,6 @@ check_ipt_lib_dir ...@@ -300,8 +283,6 @@ check_ipt_lib_dir
echo -n "libc has setns: " echo -n "libc has setns: "
check_setns check_setns
echo -n "netns has peer id suport: "
check_netnsid
echo -n "SELinux support: " echo -n "SELinux support: "
check_selinux check_selinux
......
...@@ -16,10 +16,6 @@ ifeq ($(IP_CONFIG_SETNS),y) ...@@ -16,10 +16,6 @@ ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS CFLAGS += -DHAVE_SETNS
endif endif
ifeq ($(IP_CONFIG_NETNSID),y)
CFLAGS += -DHAVE_NETNSID
endif
ALLOBJ=$(IPOBJ) $(RTMONOBJ) ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon TARGETS=ip rtmon
......
...@@ -34,7 +34,6 @@ static int usage(void) ...@@ -34,7 +34,6 @@ static int usage(void)
exit(-1); exit(-1);
} }
#ifdef HAVE_NETNSID
static int get_netnsid_from_name(const char *name) static int get_netnsid_from_name(const char *name)
{ {
struct { struct {
...@@ -79,12 +78,6 @@ static int get_netnsid_from_name(const char *name) ...@@ -79,12 +78,6 @@ static int get_netnsid_from_name(const char *name)
return -1; 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) static int netns_list(int argc, char **argv)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment