Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-22 12:24:38 +00:00
Code Issues Projects Releases Wiki Activity

[IPVS]: ipv4_table --> ipvs_ipv4_table

Browse source 
Fix conflict with symbol of same name in global
namespace.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2005-08-19 16:37:30 -07:00 committed by David S. Miller
parent c59eab4637
commit bf0ff9e578
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/ipv4/ipvs/ip_vs_ctl.c
View file

@ -1598,7 +1598,7 @@ static ctl_table vs_table[] = {
{ .ctl_name = 0 }
};
static ctl_table ipv4_table[] = {
static ctl_table ipvs_ipv4_table[] = {
{
.ctl_name = NET_IPV4,
.procname = "ipv4",
@ -1613,7 +1613,7 @@ static ctl_table vs_root_table[] = {
.ctl_name = CTL_NET,
.procname = "net",
.mode = 0555,
.child = ipv4_table,
.child = ipvs_ipv4_table,
},
{ .ctl_name = 0 }
};

4
net/ipv4/ipvs/ip_vs_lblc.c
View file

@ -131,7 +131,7 @@ static ctl_table vs_table[] = {
{ .ctl_name = 0 }
};
static ctl_table ipv4_table[] = {
static ctl_table ipvs_ipv4_table[] = {
{
.ctl_name = NET_IPV4,
.procname = "ipv4",
@ -146,7 +146,7 @@ static ctl_table lblc_root_table[] = {
.ctl_name = CTL_NET,
.procname = "net",
.mode = 0555,
.child = ipv4_table
.child = ipvs_ipv4_table
},
{ .ctl_name = 0 }
};

4
net/ipv4/ipvs/ip_vs_lblcr.c
View file

@ -320,7 +320,7 @@ static ctl_table vs_table[] = {
{ .ctl_name = 0 }
};
static ctl_table ipv4_table[] = {
static ctl_table ipvs_ipv4_table[] = {
{
.ctl_name = NET_IPV4,
.procname = "ipv4",
@ -335,7 +335,7 @@ static ctl_table lblcr_root_table[] = {
.ctl_name = CTL_NET,
.procname = "net",
.mode = 0555,
.child = ipv4_table
.child = ipvs_ipv4_table
},
{ .ctl_name = 0 }
};