summaryrefslogtreecommitdiffstats
path: root/net/decnet
diff options
context:
space:
mode:
authorHimangi Saraogi <himangi774@gmail.com>2014-08-20 23:13:07 +0530
committerDavid S. Miller <davem@davemloft.net>2014-08-22 12:23:11 -0700
commitb5c5c36d367c670b9a93b1029d9b3af8610d9535 (patch)
tree60b556df3263211a6136038b5bf88142dcd81856 /net/decnet
parent0932997e34bad52353c25756c55ccf97c522ae7c (diff)
downloadlinux-stable-b5c5c36d367c670b9a93b1029d9b3af8610d9535.tar.gz
linux-stable-b5c5c36d367c670b9a93b1029d9b3af8610d9535.tar.bz2
linux-stable-b5c5c36d367c670b9a93b1029d9b3af8610d9535.zip
dn_dev: Use time_before
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_before(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_dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 3b726f31c64c..4400da7739da 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -41,6 +41,7 @@
#include <linux/sysctl.h>
#include <linux/notifier.h>
#include <linux/slab.h>
+#include <linux/jiffies.h>
#include <asm/uaccess.h>
#include <net/net_namespace.h>
#include <net/neighbour.h>
@@ -875,7 +876,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn_ifaddr *ifa)
{
/* First check time since device went up */
- if ((jiffies - dn_db->uptime) < DRDELAY)
+ if (time_before(jiffies, dn_db->uptime + DRDELAY))
return 0;
/* If there is no router, then yes... */