projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
abaa72d
)
ipv4: Fix again the time difference calculation
author
Julian Anastasov
<ja@ssi.bg>
Thu, 19 Jul 2012 20:02:45 +0000
(23:02 +0300)
committer
David S. Miller
<davem@davemloft.net>
Thu, 19 Jul 2012 20:01:44 +0000
(13:01 -0700)
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>
net/ipv4/route.c
patch
|
blob
|
history
diff --git
a/net/ipv4/route.c
b/net/ipv4/route.c
index 89e39dc5336b85db45def0ad16dd3667b5d83c55..9f7ffbe201c93fbd63c73a3b85cd8a80306d3ea5 100644
(file)
--- 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 - expir
es;
+ unsigned long diff =
expires - jiffi
es;
if (time_before(jiffies, expires)) {
rt->rt_pmtu = pmtu;