| Message ID | 1449234908-29623-1-git-send-email-bjorn@mork.no |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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! :) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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!
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
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(-)