Commit 73cf0e92 authored by zhuyj's avatar zhuyj Committed by David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarZhu Yanjun <Yanjun.Zhu@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12bbd595
...@@ -5380,10 +5380,8 @@ static void __net_exit addrconf_exit_net(struct net *net) ...@@ -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_dflt);
__addrconf_sysctl_unregister(net->ipv6.devconf_all); __addrconf_sysctl_unregister(net->ipv6.devconf_all);
#endif #endif
if (!net_eq(net, &init_net)) { kfree(net->ipv6.devconf_dflt);
kfree(net->ipv6.devconf_dflt); kfree(net->ipv6.devconf_all);
kfree(net->ipv6.devconf_all);
}
} }
static struct pernet_operations addrconf_ops = { static struct pernet_operations addrconf_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment