ipv6: fix rt6_update_expires
authorJiri Bohac <jbohac@suse.cz>
Mon, 16 Apr 2012 03:34:39 +0000 (03:34 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Apr 2012 02:31:51 +0000 (22:31 -0400)
commitedfb5d4687d587c9f714799c7ee27517118e12e6
treea3f420b125f8b55bd9135ab3c9299a2b22a24507
parentb95465c8fcd7c8619ff9ff7bbf8038ab31c7f34b
ipv6: fix rt6_update_expires

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@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip6_fib.h