ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
authorBjørn Mork <bjorn@mork.no>
Fri, 4 Dec 2015 13:15:08 +0000 (14:15 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 5 Dec 2015 23:09:46 +0000 (18:09 -0500)
commit9a1ec4612c9bfc94d4185e3459055a37a685e575
tree0b6b206c50d585e9166b180d8b38b3a2eebe58fb
parentae79a639bb3dfd168dc8c1e5d6dfc471bdf6f284
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 <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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/addrconf.c