diff options
| author | zhuyj <zyjzyj2000@gmail.com> | 2014-11-26 10:25:58 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-26 12:27:04 -0500 |
| commit | 73cf0e923d685a6a1b7754c7d29cc14944f271d9 (patch) | |
| tree | 43d2b09629396564e59aee6cce747df9578fced8 /net/ipv6/addrconf.c | |
| parent | 12bbd595ab45f093db36d12768926422013b3441 (diff) | |
| download | linux-73cf0e923d685a6a1b7754c7d29cc14944f271d9.tar.gz linux-73cf0e923d685a6a1b7754c7d29cc14944f271d9.tar.bz2 linux-73cf0e923d685a6a1b7754c7d29cc14944f271d9.zip | |
ipv6: Remove unnecessary test
The "init_net" test in function addrconf_exit_net is introduced
in commit 44a6bd29 [Create ipv6 devconf-s for namespaces] to avoid freeing
init_net. In commit c900a800 [ipv6: fix bad free of addrconf_init_net],
function addrconf_init_net will allocate memory for every net regardless of
init_net. In this case, it is unnecessary to make "init_net" test.
CC: Hong Zhiguo <honkiko@gmail.com>
CC: Octavian Purdila <opurdila@ixiacom.com>
CC: Pavel Emelyanov <xemul@openvz.org>
CC: Cong Wang <cwang@twopensource.com>
Suggested-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Zhu Yanjun <Yanjun.Zhu@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 9eac3a7fefa3..f7c8bbeb27b7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5380,10 +5380,8 @@ static void __net_exit addrconf_exit_net(struct net *net) __addrconf_sysctl_unregister(net->ipv6.devconf_dflt); __addrconf_sysctl_unregister(net->ipv6.devconf_all); #endif - if (!net_eq(net, &init_net)) { - kfree(net->ipv6.devconf_dflt); - kfree(net->ipv6.devconf_all); - } + kfree(net->ipv6.devconf_dflt); + kfree(net->ipv6.devconf_all); } static struct pernet_operations addrconf_ops = { |