aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2012-07-19 23:02:45 +0300
committerDavid S. Miller <davem@davemloft.net>2012-07-19 13:01:44 -0700
commitf31fd383821555cbd77ee83e17837f7060825395 (patch)
tree3c4122f2c84c3d4a9a1c14a24a0b26f2a10259e5 /net/ipv4/route.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-dev-f31fd383821555cbd77ee83e17837f7060825395.tar.xz
linux-dev-f31fd383821555cbd77ee83e17837f7060825395.zip
ipv4: Fix again the time difference calculation
Fix again the diff value in rt_bind_exception after collision of two latest patches, my original commit actually fixed the same problem. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--net/ipv4/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 89e39dc5336b..9f7ffbe201c9 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1926,7 +1926,7 @@ restart:
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;