diff -NurpP --minimal linux-2.6.38.3-vs2.3.0.37-rc12/include/linux/vserver/network_cmd.h linux-2.6.38.3-vs2.3.0.37-rc13/include/linux/vserver/network_cmd.h --- linux-2.6.38.3-vs2.3.0.37-rc12/include/linux/vserver/network_cmd.h 2011-04-04 10:26:39.000000000 +0200 +++ linux-2.6.38.3-vs2.3.0.37-rc13/include/linux/vserver/network_cmd.h 2011-04-15 16:09:57.000000000 +0200 @@ -46,7 +46,7 @@ struct vcmd_net_addr_v0 { }; #define VCMD_net_add_ipv4_v1 VC_CMD(NETALT, 1, 1) -#define VCMD_net_remove_ipv4_v1 VC_CMD(NETALT, 2, 1) +#define VCMD_net_rem_ipv4_v1 VC_CMD(NETALT, 2, 1) struct vcmd_net_addr_ipv4_v1 { uint16_t type; @@ -56,7 +56,7 @@ struct vcmd_net_addr_ipv4_v1 { }; #define VCMD_net_add_ipv4 VC_CMD(NETALT, 1, 2) -#define VCMD_net_remove_ipv4 VC_CMD(NETALT, 2, 2) +#define VCMD_net_rem_ipv4 VC_CMD(NETALT, 2, 2) struct vcmd_net_addr_ipv4_v2 { uint16_t type; @@ -114,8 +114,8 @@ extern int vc_net_remove(struct nx_info extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *); extern int vc_net_add_ipv4(struct nx_info *, void __user *); -extern int vc_net_remove_ipv4_v1(struct nx_info *, void __user *); -extern int vc_net_remove_ipv4(struct nx_info *, void __user *); +extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *); +extern int vc_net_rem_ipv4(struct nx_info *, void __user *); extern int vc_net_add_ipv6(struct nx_info *, void __user *); extern int vc_net_remove_ipv6(struct nx_info *, void __user *); diff -NurpP --minimal linux-2.6.38.3-vs2.3.0.37-rc12/kernel/vserver/network.c linux-2.6.38.3-vs2.3.0.37-rc13/kernel/vserver/network.c --- linux-2.6.38.3-vs2.3.0.37-rc12/kernel/vserver/network.c 2011-04-04 10:37:26.000000000 +0200 +++ linux-2.6.38.3-vs2.3.0.37-rc13/kernel/vserver/network.c 2011-04-15 16:07:48.000000000 +0200 @@ -755,7 +755,7 @@ int vc_net_add_ipv4(struct nx_info *nxi, return 0; } -int vc_net_remove_ipv4_v1(struct nx_info *nxi, void __user *data) +int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data) { struct vcmd_net_addr_ipv4_v1 vc_data; @@ -766,7 +766,7 @@ int vc_net_remove_ipv4_v1(struct nx_info vc_data.mask.s_addr, vc_data.type, vc_data.flags); } -int vc_net_remove_ipv4(struct nx_info *nxi, void __user *data) +int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data) { struct vcmd_net_addr_ipv4_v2 vc_data; diff -NurpP --minimal linux-2.6.38.3-vs2.3.0.37-rc12/kernel/vserver/switch.c linux-2.6.38.3-vs2.3.0.37-rc13/kernel/vserver/switch.c --- linux-2.6.38.3-vs2.3.0.37-rc12/kernel/vserver/switch.c 2011-04-04 10:16:59.000000000 +0200 +++ linux-2.6.38.3-vs2.3.0.37-rc13/kernel/vserver/switch.c 2011-04-15 16:09:19.000000000 +0200 @@ -239,11 +239,11 @@ long do_vcmd(uint32_t cmd, uint32_t id, case VCMD_net_add_ipv4: return vc_net_add_ipv4(nxi, data); - case VCMD_net_remove_ipv4_v1: - return vc_net_remove_ipv4_v1(nxi, data); + case VCMD_net_rem_ipv4_v1: + return vc_net_rem_ipv4_v1(nxi, data); /* this is version 2 */ - case VCMD_net_remove_ipv4: - return vc_net_remove_ipv4(nxi, data); + case VCMD_net_rem_ipv4: + return vc_net_rem_ipv4(nxi, data); #ifdef CONFIG_IPV6 case VCMD_net_add_ipv6: return vc_net_add_ipv6(nxi, data); @@ -380,8 +380,10 @@ long do_vserver(uint32_t cmd, uint32_t i __VCMD(set_nflags, 7, VCA_NXI, VCF_ARES | VCF_SETUP); __VCMD(net_add, 8, VCA_NXI, VCF_ARES | VCF_SETUP); __VCMD(net_remove, 8, VCA_NXI, VCF_ARES | VCF_SETUP); + __VCMD(net_add_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP); + __VCMD(net_rem_ipv4_v1, 8, VCA_NXI, VCF_ARES | VCF_SETUP); __VCMD(net_add_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); - __VCMD(net_remove_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); + __VCMD(net_rem_ipv4, 8, VCA_NXI, VCF_ARES | VCF_SETUP); #ifdef CONFIG_IPV6 __VCMD(net_add_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP); __VCMD(net_remove_ipv6, 8, VCA_NXI, VCF_ARES | VCF_SETUP);