[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4F8E25F0.3040703@cn.fujitsu.com>
Date: Wed, 18 Apr 2012 10:24:48 +0800
From: Gao feng <gaofeng@...fujitsu.com>
To: Jiri Bohac <jbohac@...e.cz>
CC: David Miller <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH] ipv6: fix rt6_update_expires
于 2012年04月16日 21:34, Jiri Bohac 写道:
>
> Commit 1716a961 (ipv6: fix problem with expired dst cache) broke PMTU
> discovery. rt6_update_expires() calls dst_set_expires(), which only updates
> dst->expires if it has not been set previously (expires == 0) or if the new
> expires is earlier than the current dst->expires.
>
> rt6_update_expires() needs to zero rt->dst.expires, otherwise it will contain
> ivalid data left over from rt->dst.from and will confuse dst_set_expires().
>
> Signed-off-by: Jiri Bohac <jbohac@...e.cz>
>
> diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
> index ad4126f..68c1f94 100644
> --- a/include/net/ip6_fib.h
> +++ b/include/net/ip6_fib.h
> @@ -143,8 +143,13 @@ static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires)
>
> static inline void rt6_update_expires(struct rt6_info *rt, int timeout)
> {
> - if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from)
> - dst_release(rt->dst.from);
> + if (!(rt->rt6i_flags & RTF_EXPIRES)) {
> + if (rt->dst.from)
> + dst_release(rt->dst.from);
> + /* dst_set_expires relies on expires == 0
> + if it has not been set previously */
> + rt->dst.expires = 0;
> + }
>
> dst_set_expires(&rt->dst, timeout);
> rt->rt6i_flags |= RTF_EXPIRES;
>
looks good to me, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists