Re: [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC

2015-12-05 Thread David Miller 
From: Bjørn Mork 
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 
> Cc: Fernando Gont 
> Cc: Lorenzo Colitti 
> Cc: YOSHIFUJI Hideaki/吉藤英明 
> Cc: Hannes Frederic Sowa 
> Fixes: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
> Signed-off-by: Bjørn Mork 

Applied and queued up for -stable, thanks!

Re: [PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC

2015-12-04 Thread Hannes Frederic Sowa 
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 
> Cc: Fernando Gont 
> Cc: Lorenzo Colitti 
> Cc: YOSHIFUJI Hideaki/吉藤英明 
> Cc: Hannes Frederic Sowa 
> Fixes: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
> Signed-off-by: Bjørn Mork 

Acked-by: Hannes Frederic Sowa 

Ups, thanks! :)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ipv6: keep existing flags when setting IFA_F_OPTIMISTIC

2015-12-04 Thread Bjørn Mork 
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 
Cc: Fernando Gont 
Cc: Lorenzo Colitti 
Cc: YOSHIFUJI Hideaki/吉藤英明 
Cc: Hannes Frederic Sowa 
Fixes: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
Signed-off-by: Bjørn Mork 
---
 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

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html