Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c30d76 authored Jul 09, 2018 by Sabrina Dubroca Committed by David S. Miller Jul 11, 2018

net/ipv6: don't reinitialize ndev->cnf.addr_gen_mode on new inet6_dev



The value has already been copied from this netns's devconf_dflt, it
shouldn't be reset to the global kernel default.

Fixes: d35a00b8 ("net/ipv6: allow sysctl to change link-local address generation mode")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c6dbf7aa

net/ipv6/addrconf.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -385,8 +385,6 @@ static struct inet6_dev ipv6_add_dev(struct net_device dev)

	if (ndev->cnf.stable_secret.initialized)		if (ndev->cnf.stable_secret.initialized)
	ndev->cnf.addr_gen_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;		ndev->cnf.addr_gen_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
	else
	ndev->cnf.addr_gen_mode = ipv6_devconf_dflt.addr_gen_mode;

	ndev->cnf.mtu6 = dev->mtu;		ndev->cnf.mtu6 = dev->mtu;
	ndev->nd_parms = neigh_parms_alloc(dev, &nd_tbl);		ndev->nd_parms = neigh_parms_alloc(dev, &nd_tbl);