diff options
| author | Himangi Saraogi <himangi774@gmail.com> | 2014-08-20 23:24:40 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-22 12:23:11 -0700 |
| commit | c0b802367b05fa6342ab9ef07abdf446b9ba223f (patch) | |
| tree | 942fee23ef183ff578a3a535780e9c2c8d005bf3 /net/decnet/af_decnet.c | |
| parent | 8b1b1eb521004cec2518307c22dba8f4bff1c2bf (diff) | |
| download | op-kernel-dev-c0b802367b05fa6342ab9ef07abdf446b9ba223f.zip op-kernel-dev-c0b802367b05fa6342ab9ef07abdf446b9ba223f.tar.gz | |
af_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,E3;
@@
- jiffies - E1 >= (E2*E3)
+ time_after_eq(jiffies, E1+E2*E3)
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/af_decnet.c')
| -rw-r--r-- | net/decnet/af_decnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index ae011b4..25733d5 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -127,6 +127,7 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat #include <linux/stat.h> #include <linux/init.h> #include <linux/poll.h> +#include <linux/jiffies.h> #include <net/net_namespace.h> #include <net/neighbour.h> #include <net/dst.h> @@ -598,7 +599,7 @@ int dn_destroy_timer(struct sock *sk) if (sk->sk_socket) return 0; - if ((jiffies - scp->stamp) >= (HZ * decnet_time_wait)) { + if (time_after_eq(jiffies, scp->stamp + HZ * decnet_time_wait)) { dn_unhash_sock(sk); sock_put(sk); return 1; |
