ipv6: keep existing flags when setting IFA_F_OPTIMISTIC

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 <[email protected]>
Cc: Fernando Gont <[email protected]>
Cc: Lorenzo Colitti <[email protected]>
Cc: YOSHIFUJI Hideaki/吉藤英明 <[email protected]>
Cc: Hannes Frederic Sowa <[email protected]>
Fixes: 64236f3f3d74 ("ipv6: introduce IFA_F_STABLE_PRIVACY flag")
Signed-off-by: Bjørn Mork <[email protected]>
Acked-by: Hannes Frederic Sowa <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 61f26851655ccd23200278d34ceda44351da1c17..a57d3d17a6204c722fbb3ae6aea25460c44cbc34 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -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