提交 bf0ff9e5 编写于 作者: D David S. Miller 提交者: David S. Miller

[IPVS]: ipv4_table --> ipvs_ipv4_table

Fix conflict with symbol of same name in global
namespace.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 c59eab46
...@@ -1598,7 +1598,7 @@ static ctl_table vs_table[] = { ...@@ -1598,7 +1598,7 @@ static ctl_table vs_table[] = {
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
static ctl_table ipv4_table[] = { static ctl_table ipvs_ipv4_table[] = {
{ {
.ctl_name = NET_IPV4, .ctl_name = NET_IPV4,
.procname = "ipv4", .procname = "ipv4",
...@@ -1613,7 +1613,7 @@ static ctl_table vs_root_table[] = { ...@@ -1613,7 +1613,7 @@ static ctl_table vs_root_table[] = {
.ctl_name = CTL_NET, .ctl_name = CTL_NET,
.procname = "net", .procname = "net",
.mode = 0555, .mode = 0555,
.child = ipv4_table, .child = ipvs_ipv4_table,
}, },
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
......
...@@ -131,7 +131,7 @@ static ctl_table vs_table[] = { ...@@ -131,7 +131,7 @@ static ctl_table vs_table[] = {
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
static ctl_table ipv4_table[] = { static ctl_table ipvs_ipv4_table[] = {
{ {
.ctl_name = NET_IPV4, .ctl_name = NET_IPV4,
.procname = "ipv4", .procname = "ipv4",
...@@ -146,7 +146,7 @@ static ctl_table lblc_root_table[] = { ...@@ -146,7 +146,7 @@ static ctl_table lblc_root_table[] = {
.ctl_name = CTL_NET, .ctl_name = CTL_NET,
.procname = "net", .procname = "net",
.mode = 0555, .mode = 0555,
.child = ipv4_table .child = ipvs_ipv4_table
}, },
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
......
...@@ -320,7 +320,7 @@ static ctl_table vs_table[] = { ...@@ -320,7 +320,7 @@ static ctl_table vs_table[] = {
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
static ctl_table ipv4_table[] = { static ctl_table ipvs_ipv4_table[] = {
{ {
.ctl_name = NET_IPV4, .ctl_name = NET_IPV4,
.procname = "ipv4", .procname = "ipv4",
...@@ -335,7 +335,7 @@ static ctl_table lblcr_root_table[] = { ...@@ -335,7 +335,7 @@ static ctl_table lblcr_root_table[] = {
.ctl_name = CTL_NET, .ctl_name = CTL_NET,
.procname = "net", .procname = "net",
.mode = 0555, .mode = 0555,
.child = ipv4_table .child = ipvs_ipv4_table
}, },
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册