diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2009-07-28 09:48:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-02 12:54:30 -0700 |
| commit | 81e43213882e62374c1a87f9d97d4287ed9f7257 (patch) | |
| tree | ae57fd6a2f3b963e5406ec45ac291d5640cedd97 | |
| parent | 8b97c7c283c5ba8f9f4dabd418fd7dcfcc8a387e (diff) | |
| download | blackbird-op-linux-81e43213882e62374c1a87f9d97d4287ed9f7257.tar.gz blackbird-op-linux-81e43213882e62374c1a87f9d97d4287ed9f7257.zip | |
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[] = { { .ctl_name = 0 } }; -static ctl_table ipv6_table[] = { +static ctl_table ipv6_rotable[] = { { .ctl_name = NET_IPV6_MLD_MAX_MSF, .procname = "mld_max_msf", @@ -130,7 +130,7 @@ int ipv6_sysctl_register(void) { int err = -ENOMEM; - ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_table); + ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_rotable); if (ip6_header == NULL) goto out; |
