From b9dab569dfcd2e89f2d212e8945046bbff10f60e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 19 Jul 2012 08:46:59 -0700 Subject: [PATCH] --- yaml --- r: 315497 b: refs/heads/master c: 7fed84f622ec2696087301199c2952b85e0cc3b4 h: refs/heads/master i: 315495: 31526ff8850bfc79b9b081dba00b9bc6ddd16031 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 09990864d18e..1fddf1ec86da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb8c695bda92ccaec30e9a3351e37a1896da54f +refs/heads/master: 7fed84f622ec2696087301199c2952b85e0cc3b4 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index f67e70236728..2c25581bf25c 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1907,7 +1907,7 @@ static void rt_bind_exception(struct rtable *rt, struct fib_nh *nh, __be32 daddr if (fnhe->fnhe_daddr == daddr) { if (fnhe->fnhe_pmtu) { unsigned long expires = fnhe->fnhe_expires; - unsigned long diff = jiffies - expires; + unsigned long diff = expires - jiffies; if (time_before(jiffies, expires)) { rt->rt_pmtu = fnhe->fnhe_pmtu;