diff options
| author | Manuel Schölling <manuel.schoelling@gmx.de> | 2014-05-21 22:08:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-22 15:50:12 -0400 |
| commit | 87f03cc3c67d4a6b5c35119e339bab640600effb (patch) | |
| tree | cd290d8c3b0b715ad382349a6ed30f9e4d68e120 /drivers/isdn | |
| parent | 0797fb083f6588a800dfbff1aecbb2aed8d4f673 (diff) | |
| download | op-kernel-dev-87f03cc3c67d4a6b5c35119e339bab640600effb.zip op-kernel-dev-87f03cc3c67d4a6b5c35119e339bab640600effb.tar.gz | |
mISDN: Use mod_timer()
The code for resetting the timer can be simplified if mod_timer() is used
instead of del_timer() followed by add_timer().
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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 084f936..9f454d7 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -287,11 +287,9 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, p = frame; /* restart timer */ - 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); - } else + if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) + mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ); + else hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; if (debug & DEBUG_L1OIP_MSG) @@ -623,9 +621,7 @@ multiframe: /* restart timer */ 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; - add_timer(&hc->timeout_tl); + mod_timer(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ); } else /* only adjust timer */ hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ; |
