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>

diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 2c0d2c2bf94648e273b7614a65e1bc09976663e8..084f9369249f246bdccdfe1a163fc261de3f32e1 100644 (file)
--- 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;