diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2014-08-20 13:50:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-22 15:23:11 -0400 |
commit | 8b1b1eb521004cec2518307c22dba8f4bff1c2bf (patch) | |
tree | b7a36384538f2a7831a5ee08080463990450d438 /net/decnet | |
parent | c72c95a064e55923c5dd050d099e51ac550f29a2 (diff) |
decnet: Use time_after_eq
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the Coccinelle semantic patch making this change
is as follows:
@change@
expression E1,E2;
@@
- (jiffies - E1) >= E2
+ time_after_eq(jiffies, E1+E2)
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c index d9c150cc59a9..1d330fd43dc7 100644 --- a/net/decnet/dn_timer.c +++ b/net/decnet/dn_timer.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
24 | #include <net/sock.h> | 24 | #include <net/sock.h> |
25 | #include <linux/atomic.h> | 25 | #include <linux/atomic.h> |
26 | #include <linux/jiffies.h> | ||
26 | #include <net/flow.h> | 27 | #include <net/flow.h> |
27 | #include <net/dn.h> | 28 | #include <net/dn.h> |
28 | 29 | ||
@@ -91,7 +92,7 @@ static void dn_slow_timer(unsigned long arg) | |||
91 | * since the last successful transmission. | 92 | * since the last successful transmission. |
92 | */ | 93 | */ |
93 | if (scp->keepalive && scp->keepalive_fxn && (scp->state == DN_RUN)) { | 94 | if (scp->keepalive && scp->keepalive_fxn && (scp->state == DN_RUN)) { |
94 | if ((jiffies - scp->stamp) >= scp->keepalive) | 95 | if (time_after_eq(jiffies, scp->stamp + scp->keepalive)) |
95 | scp->keepalive_fxn(sk); | 96 | scp->keepalive_fxn(sk); |
96 | } | 97 | } |
97 | 98 | ||