diff options
author | Manuel Schölling <manuel.schoelling@gmx.de> | 2014-05-21 16:08:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-22 15:50:12 -0400 |
commit | 0797fb083f6588a800dfbff1aecbb2aed8d4f673 (patch) | |
tree | f8befebf6ad562cf8720f9f0abb774444221eba9 /drivers/isdn | |
parent | 2b3d9655119625cc102756395715292150a8980e (diff) |
mISDN: Use time_before()
To be future-proof and for better readability the time comparisons are modified
to use time_before() instead of plain, error-prone math.
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 2c0d2c2bf946..084f9369249f 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -287,7 +287,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, | |||
287 | p = frame; | 287 | p = frame; |
288 | 288 | ||
289 | /* restart timer */ | 289 | /* restart timer */ |
290 | if ((int)(hc->keep_tl.expires-jiffies) < 5 * HZ) { | 290 | if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) { |
291 | del_timer(&hc->keep_tl); | 291 | del_timer(&hc->keep_tl); |
292 | hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; | 292 | hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; |
293 | add_timer(&hc->keep_tl); | 293 | add_timer(&hc->keep_tl); |
@@ -621,7 +621,7 @@ multiframe: | |||
621 | goto multiframe; | 621 | goto multiframe; |
622 | 622 | ||
623 | /* restart timer */ | 623 | /* restart timer */ |
624 | if ((int)(hc->timeout_tl.expires-jiffies) < 5 * HZ || !hc->timeout_on) { | 624 | if (time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || !hc->timeout_on) { |
625 | hc->timeout_on = 1; | 625 | hc->timeout_on = 1; |
626 | del_timer(&hc->timeout_tl); | 626 | del_timer(&hc->timeout_tl); |
627 | hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ; | 627 | hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ; |