Commit 9a1ec461 authored Dec 04, 2015 by Bjørn Mork Committed by David S. Miller Dec 05, 2015

ipv6: keep existing flags when setting IFA_F_OPTIMISTIC

Commit 64236f3f ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
failed to update the setting of the IFA_F_OPTIMISTIC flag, causing
the IFA_F_STABLE_PRIVACY flag to be lost if IFA_F_OPTIMISTIC is set.

Cc: Erik Kline <ek@google.com>
Cc: Fernando Gont <fgont@si6networks.com>
Cc: Lorenzo Colitti <lorenzo@google.com>
Cc: YOSHIFUJI Hideaki/吉藤英明 <hideaki.yoshifuji@miraclelinux.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Fixes: 64236f3f ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ae79a639

net/ipv6/addrconf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2455,7 +2455,7 @@ ok:
		#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
		if (in6_dev->cnf.optimistic_dad &&
		!net->ipv6.devconf_all->forwarding && sllao)
		addr_flags = IFA_F_OPTIMISTIC;
		addr_flags \|= IFA_F_OPTIMISTIC;
		#endif

		/* Do not allow to create too much of autoconfigured

Admin message