From c63b886852515b1cab31f09dbc0e57067d6dd37f Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Thu, 19 Jul 2012 23:02:45 +0300 Subject: [PATCH] --- yaml --- r: 315519 b: refs/heads/master c: f31fd383821555cbd77ee83e17837f7060825395 h: refs/heads/master i: 315517: 9ac4036e38168a9838a2076b5ef851d77e0ef06a 315515: 04ce92ddfab133c3ba296838c3a0b51a2a9d979c 315511: 59c688a18c8e9b1f70949316c9ce87f609c47d53 315503: dbbf6221d0e9d6efde985738a5ccec1a6450f7f0 315487: c6c313b998d59a6b59602c4a93ba63e9795efe7f 315455: 34addd7ceeff29ff399ad861196b6a545c1daf01 315391: 759ec0d58a0b327959a09290fe1a308eaff7007d v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cbdd660bd26e..98edc3d126a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abaa72d7fd9a20a67b62e6afa0e746e27851dc33 +refs/heads/master: f31fd383821555cbd77ee83e17837f7060825395 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 89e39dc5336b..9f7ffbe201c9 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1926,7 +1926,7 @@ static void rt_bind_exception(struct rtable *rt, struct fib_nh *nh, __be32 daddr if (daddr != fnhe_daddr) continue; if (pmtu) { - unsigned long diff = jiffies - expires; + unsigned long diff = expires - jiffies; if (time_before(jiffies, expires)) { rt->rt_pmtu = pmtu;