diff options
| author | Himangi Saraogi <himangi774@gmail.com> | 2014-08-20 19:43:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-22 21:23:11 +0200 |
| commit | b5c5c36d367c670b9a93b1029d9b3af8610d9535 (patch) | |
| tree | 60b556df3263211a6136038b5bf88142dcd81856 /net/decnet/dn_dev.c | |
| parent | br_multicast: Replace rcu_assign_pointer() with RCU_INIT_POINTER() (diff) | |
| download | linux-b5c5c36d367c670b9a93b1029d9b3af8610d9535.tar.xz linux-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/dn_dev.c')
| -rw-r--r-- | net/decnet/dn_dev.c | 3 |
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... */ |