X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fsyscall_netremove-netv2.hc;h=1e916aa10302e9d8454c9b79298300811a5033a0;hb=989f6cc00a65b6c06f1453f50abc442a28dad714;hp=2ca4331e96cfe00c3263ed01a8532c5e495dbbce;hpb=a6be71d3e49f0f633705ba5e4e08cc1cac811344;p=util-vserver.git diff --git a/lib/syscall_netremove-netv2.hc b/lib/syscall_netremove-netv2.hc index 2ca4331..1e916aa 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_v1, NID_USER2KERNEL(nid), &k_ipv4); } switch (info->vna_type & (VC_NXA_TYPE_IPV4 | VC_NXA_TYPE_IPV6)) { case VC_NXA_TYPE_IPV4: { @@ -45,7 +45,7 @@ vc_net_remove_netv2(nid_t nid, struct vc_net_addr const *info) k_info.ip.s_addr = info->vna_v4_ip.s_addr; k_info.mask.s_addr = info->vna_v4_mask.s_addr; - return vserver(VCMD_net_remove_ipv4, NID_USER2KERNEL(nid), &k_info); + return vserver(VCMD_net_remove_ipv4_v1, NID_USER2KERNEL(nid), &k_info); } case VC_NXA_TYPE_IPV6: { struct vcmd_net_addr_ipv6_v1 k_info;