summaryrefslogtreecommitdiffstats
path: root/net/decnet
diff options
context:
space:
mode:
authorHimangi Saraogi <himangi774@gmail.com>2014-08-20 23:20:09 +0530
committerDavid S. Miller <davem@davemloft.net>2014-08-22 12:23:11 -0700
commit8b1b1eb521004cec2518307c22dba8f4bff1c2bf (patch)
treeb7a36384538f2a7831a5ee08080463990450d438 /net/decnet
parentc72c95a064e55923c5dd050d099e51ac550f29a2 (diff)
downloadlinux-8b1b1eb521004cec2518307c22dba8f4bff1c2bf.tar.gz
linux-8b1b1eb521004cec2518307c22dba8f4bff1c2bf.tar.bz2
linux-8b1b1eb521004cec2518307c22dba8f4bff1c2bf.zip
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.c3
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 @@
#include <linux/spinlock.h>
#include <net/sock.h>
#include <linux/atomic.h>
+#include <linux/jiffies.h>
#include <net/flow.h>
#include <net/dn.h>
@@ -91,7 +92,7 @@ static void dn_slow_timer(unsigned long arg)
* since the last successful transmission.
*/
if (scp->keepalive && scp->keepalive_fxn && (scp->state == DN_RUN)) {
- if ((jiffies - scp->stamp) >= scp->keepalive)
+ if (time_after_eq(jiffies, scp->stamp + scp->keepalive))
scp->keepalive_fxn(sk);
}