diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2014-08-20 13:43:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-22 15:23:11 -0400 |
commit | b5c5c36d367c670b9a93b1029d9b3af8610d9535 (patch) | |
tree | 60b556df3263211a6136038b5bf88142dcd81856 /net/decnet/dn_dev.c | |
parent | 0932997e34bad52353c25756c55ccf97c522ae7c (diff) |
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 @@ | |||
41 | #include <linux/sysctl.h> | 41 | #include <linux/sysctl.h> |
42 | #include <linux/notifier.h> | 42 | #include <linux/notifier.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/jiffies.h> | ||
44 | #include <asm/uaccess.h> | 45 | #include <asm/uaccess.h> |
45 | #include <net/net_namespace.h> | 46 | #include <net/net_namespace.h> |
46 | #include <net/neighbour.h> | 47 | #include <net/neighbour.h> |
@@ -875,7 +876,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa) | |||
875 | static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn_ifaddr *ifa) | 876 | static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn_ifaddr *ifa) |
876 | { | 877 | { |
877 | /* First check time since device went up */ | 878 | /* First check time since device went up */ |
878 | if ((jiffies - dn_db->uptime) < DRDELAY) | 879 | if (time_before(jiffies, dn_db->uptime + DRDELAY)) |
879 | return 0; | 880 | return 0; |
880 | 881 | ||
881 | /* If there is no router, then yes... */ | 882 | /* If there is no router, then yes... */ |