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

Commit 4b77d497 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: 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: d35a00b8e33d ("net/ipv6: allow sysctl to change link-local address generation mode")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit 70c30d76e580fe4aefe6facdf0f1edb1aa9a0e7a)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I6b0100f8f423e4f3250caeeda683ea7e2335690a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 18ef8693

net/ipv6/addrconf.c

+0 −2
Original line number Diff line number Diff line
@@ -383,8 +383,6 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 


	if (ndev->cnf.stable_secret.initialized)

		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->nd_parms = neigh_parms_alloc(dev, &nd_tbl);