From c486106b5a93e7ecfac1a07bed8a9e3d9c0d2b9a Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Mon, 10 Mar 2008 19:59:18 +0000 Subject: [PATCH] A kernel without IPv6-support will return ENOSYS for vc_net_remove_ipv6. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2700 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- lib/syscall_netremove-netv2.hc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/syscall_netremove-netv2.hc b/lib/syscall_netremove-netv2.hc index 2ca4331..da03ef0 100644 --- a/lib/syscall_netremove-netv2.hc +++ b/lib/syscall_netremove-netv2.hc @@ -31,10 +31,10 @@ vc_net_remove_netv2(nid_t nid, struct vc_net_addr const *info) k_ipv4.type = VC_NXA_TYPE_ANY; k_ipv6.type = VC_NXA_TYPE_ANY; - ret = vserver(VCMD_net_remove_ipv4, NID_USER2KERNEL(nid), &k_ipv4); - if (ret == -1) + ret = vserver(VCMD_net_remove_ipv6, NID_USER2KERNEL(nid), &k_ipv6); + if (ret == -1 && errno != ENOSYS) return -1; - return vserver(VCMD_net_remove_ipv6, NID_USER2KERNEL(nid), &k_ipv6); + return vserver(VCMD_net_remove_ipv4, NID_USER2KERNEL(nid), &k_ipv4); } switch (info->vna_type & (VC_NXA_TYPE_IPV4 | VC_NXA_TYPE_IPV6)) { case VC_NXA_TYPE_IPV4: { -- 1.8.1.5