netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
@ 2015-12-04 13:15 Bjørn Mork
  2015-12-04 13:29 ` Hannes Frederic Sowa
  2015-12-05 23:10 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Bjørn Mork @ 2015-12-04 13:15 UTC (permalink / raw)
  To: netdev
  Cc: Bjørn Mork, Erik Kline, Fernando Gont, Lorenzo Colitti,
	YOSHIFUJI Hideaki/吉藤英明,
	Hannes Frederic Sowa

Commit 64236f3f3d74 ("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: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 net/ipv6/addrconf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index b5cc81a18521..b3465bbbcd82 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2463,7 +2463,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
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
  2015-12-04 13:15 [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC Bjørn Mork
@ 2015-12-04 13:29 ` Hannes Frederic Sowa
  2015-12-05 23:10 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Hannes Frederic Sowa @ 2015-12-04 13:29 UTC (permalink / raw)
  To: Bjørn Mork, netdev
  Cc: Erik Kline, Fernando Gont, Lorenzo Colitti,
	YOSHIFUJI Hideaki/吉藤英明

On Fri, Dec 4, 2015, at 14:15, Bjørn Mork wrote:
> Commit 64236f3f3d74 ("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: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
> Signed-off-by: Bjørn Mork <bjorn@mork.no>

Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>

Ups, thanks! :)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
  2015-12-04 13:15 [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC Bjørn Mork
  2015-12-04 13:29 ` Hannes Frederic Sowa
@ 2015-12-05 23:10 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-12-05 23:10 UTC (permalink / raw)
  To: bjorn; +Cc: netdev, ek, fgont, lorenzo, hideaki.yoshifuji, hannes

From: Bjørn Mork <bjorn@mork.no>
Date: Fri,  4 Dec 2015 14:15:08 +0100

> Commit 64236f3f3d74 ("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: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
> Signed-off-by: Bjørn Mork <bjorn@mork.no>

Applied and queued up for -stable, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-12-05 23:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-04 13:15 [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC Bjørn Mork
2015-12-04 13:29 ` Hannes Frederic Sowa
2015-12-05 23:10 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).