| Message ID | 20140108144322.GJ9007@order.stressinduktion.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
* Hannes Frederic Sowa <hannes@stressinduktion.org> [2014-01-08 15:43]: > In the past the IFA_PERMANENT flag indicated, that the valid and preferred > lifetime where ignored. Since change fad8da3e085ddf ("ipv6 addrconf: fix > preferred lifetime state-changing behavior while valid_lft is infinity") > we honour at least the preferred lifetime on those addresses. As such > the valid lifetime gets recalculated and updated to 0. > If loopback address is added manually this problem does not occur. > Also if NetworkManager manages IPv6, those addresses will get added via > inet6_rtm_newaddr and thus will have a correct lifetime, too. I confirm this patch (on top of 3.13-rc7+) fixes the problem on my system, eth0 has a LLA adress again after boot and ::1 is back on the loopback interface. Thanks for the quick fix!
From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Wed, 8 Jan 2014 15:43:22 +0100 > In the past the IFA_PERMANENT flag indicated, that the valid and preferred > lifetime where ignored. Since change fad8da3e085ddf ("ipv6 addrconf: fix > preferred lifetime state-changing behavior while valid_lft is infinity") > we honour at least the preferred lifetime on those addresses. As such > the valid lifetime gets recalculated and updated to 0. > > If loopback address is added manually this problem does not occur. > Also if NetworkManager manages IPv6, those addresses will get added via > inet6_rtm_newaddr and thus will have a correct lifetime, too. > > Reported-by: François-Xavier Le Bail <fx.lebail@yahoo.com> > Reported-by: Damien Wyart <damien.wyart@gmail.com> > Fixes: fad8da3e085ddf ("ipv6 addrconf: fix preferred lifetime state-changing behavior while valid_lft is infinity") > Cc: Yasushi Asano <yasushi.asano@jp.fujitsu.com> > Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Applied, thanks Hannes. > I hope there will be another pull request to Linus before 3.13 (I think > there will be an upcoming -rc8 this Sunday?). I think I will be able to sneak one more pull request in. -- 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
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 31f75ea..01263a1 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2528,7 +2528,8 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr, struct inet6_ifaddr *ifp; ifp = ipv6_add_addr(idev, addr, NULL, plen, - scope, IFA_F_PERMANENT, 0, 0); + scope, IFA_F_PERMANENT, + INFINITY_LIFE_TIME, INFINITY_LIFE_TIME); if (!IS_ERR(ifp)) { spin_lock_bh(&ifp->lock); ifp->flags &= ~IFA_F_TENTATIVE; @@ -2656,7 +2657,8 @@ static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr #endif - ifp = ipv6_add_addr(idev, addr, NULL, 64, IFA_LINK, addr_flags, 0, 0); + ifp = ipv6_add_addr(idev, addr, NULL, 64, IFA_LINK, addr_flags, + INFINITY_LIFE_TIME, INFINITY_LIFE_TIME); if (!IS_ERR(ifp)) { addrconf_prefix_route(&ifp->addr, ifp->prefix_len, idev->dev, 0, 0); addrconf_dad_start(ifp);
In the past the IFA_PERMANENT flag indicated, that the valid and preferred lifetime where ignored. Since change fad8da3e085ddf ("ipv6 addrconf: fix preferred lifetime state-changing behavior while valid_lft is infinity") we honour at least the preferred lifetime on those addresses. As such the valid lifetime gets recalculated and updated to 0. If loopback address is added manually this problem does not occur. Also if NetworkManager manages IPv6, those addresses will get added via inet6_rtm_newaddr and thus will have a correct lifetime, too. Reported-by: François-Xavier Le Bail <fx.lebail@yahoo.com> Reported-by: Damien Wyart <damien.wyart@gmail.com> Fixes: fad8da3e085ddf ("ipv6 addrconf: fix preferred lifetime state-changing behavior while valid_lft is infinity") Cc: Yasushi Asano <yasushi.asano@jp.fujitsu.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> --- I hope there will be another pull request to Linus before 3.13 (I think there will be an upcoming -rc8 this Sunday?). net/ipv6/addrconf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)