Commit 73cf0e92 authored Nov 26, 2014 by zhuyj Committed by David S. Miller Nov 26, 2014

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>

parent 12bbd595

net/ipv6/addrconf.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -5380,11 +5380,9 @@ 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);
		}
		}

		static struct pernet_operations addrconf_ops = {
		.init = addrconf_init_net,

Admin message