diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-07-28 05:48:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-02 15:54:30 -0400 |
commit | 81e43213882e62374c1a87f9d97d4287ed9f7257 (patch) | |
tree | ae57fd6a2f3b963e5406ec45ac291d5640cedd97 | |
parent | 8b97c7c283c5ba8f9f4dabd418fd7dcfcc8a387e (diff) |
inet6: functions shadow global variable
This renames away a variable clash:
* ipv6_table[] is declared as a static global table;
* ipv6_sysctl_net_init() uses ipv6_table to refer/destroy dynamic memory;
* ipv6_sysctl_net_exit() also uses ipv6_table for the same purpose;
* both the two last functions call kfree() on ipv6_table.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/sysctl_net_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index a031034720b4..0dc6a4e5ed4a 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
@@ -40,7 +40,7 @@ static ctl_table ipv6_table_template[] = { | |||
40 | { .ctl_name = 0 } | 40 | { .ctl_name = 0 } |
41 | }; | 41 | }; |
42 | 42 | ||
43 | static ctl_table ipv6_table[] = { | 43 | static ctl_table ipv6_rotable[] = { |
44 | { | 44 | { |
45 | .ctl_name = NET_IPV6_MLD_MAX_MSF, | 45 | .ctl_name = NET_IPV6_MLD_MAX_MSF, |
46 | .procname = "mld_max_msf", | 46 | .procname = "mld_max_msf", |
@@ -130,7 +130,7 @@ int ipv6_sysctl_register(void) | |||
130 | { | 130 | { |
131 | int err = -ENOMEM; | 131 | int err = -ENOMEM; |
132 | 132 | ||
133 | ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_table); | 133 | ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_rotable); |
134 | if (ip6_header == NULL) | 134 | if (ip6_header == NULL) |
135 | goto out; | 135 | goto out; |
136 | 136 | ||