Commit bf0ff9e5 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller
Browse files

[IPVS]: ipv4_table --> ipvs_ipv4_table



Fix conflict with symbol of same name in global
namespace.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c59eab46
......@@ -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 }
};
......
......@@ -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 }
};
......
......@@ -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 }
};
......
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