diff options
author | David S. Miller <davem@davemloft.net> | 2005-08-19 16:37:30 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 16:02:29 -0700 |
commit | bf0ff9e578ba7dd8331005f00ad7310122011f43 (patch) | |
tree | f2dc2518debb5ab2c48d224bbfe9e82bdbb1b9e8 /net/ipv4/ipvs/ip_vs_ctl.c | |
parent | c59eab4637dbc3f832503be4ccb9213b0f323d92 (diff) | |
download | op-kernel-dev-bf0ff9e578ba7dd8331005f00ad7310122011f43.zip op-kernel-dev-bf0ff9e578ba7dd8331005f00ad7310122011f43.tar.gz |
[IPVS]: ipv4_table --> ipvs_ipv4_table
Fix conflict with symbol of same name in global
namespace.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_ctl.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_ctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index 7d99ede..2d66848 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c @@ -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 } }; |