diff options
| author |   Manuel Schölling <manuel.schoelling@gmx.de> | 2014-05-21 22:08:47 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-05-22 15:50:12 -0400 |
| commit | 0797fb083f6588a800dfbff1aecbb2aed8d4f673 (patch) | |
| tree | f8befebf6ad562cf8720f9f0abb774444221eba9 /drivers/isdn | |
| parent | qlogic: Use time_before() (diff) | |
| download | linux-dev-0797fb083f6588a800dfbff1aecbb2aed8d4f673.tar.xz linux-dev-0797fb083f6588a800dfbff1aecbb2aed8d4f673.zip | |
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, p = frame; /* restart timer */ - if ((int)(hc->keep_tl.expires-jiffies) < 5 * HZ) { + if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) { del_timer(&hc->keep_tl); hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; add_timer(&hc->keep_tl); @@ -621,7 +621,7 @@ multiframe: goto multiframe; /* restart timer */ - if ((int)(hc->timeout_tl.expires-jiffies) < 5 * HZ || !hc->timeout_on) { + if (time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || !hc->timeout_on) { hc->timeout_on = 1; del_timer(&hc->timeout_tl); hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ; |