diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2018-07-09 12:25:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-11 22:50:45 -0700 |
| commit | 70c30d76e580fe4aefe6facdf0f1edb1aa9a0e7a (patch) | |
| tree | 91b98717ded85e0ebcaeaea386eb4e32406bb670 /net/ipv6/addrconf.c | |
| parent | c6dbf7aaa48289d2eeacbef06785c069869ed0c0 (diff) | |
| download | linux-70c30d76e580fe4aefe6facdf0f1edb1aa9a0e7a.tar.bz2 | |
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: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e9ba53d2a147..e20f8a1d8cdb 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -385,8 +385,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); |