Messages in this thread Patch in this message | | | From | Manuel Schölling <> | Subject | [PATCH 2/2] mISDN: use mod_timer() | Date | Wed, 21 May 2014 21:10:06 +0200 |
| |
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> --- drivers/isdn/mISDN/l1oip_core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 1c2bc36..a4c6cc0 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -288,9 +288,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, /* restart timer */ if (time_before(hc->keep_tl.expires - 5 * HZ, jiffies)) { - del_timer(&hc->keep_tl); - hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; - add_timer(&hc->keep_tl); + mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ); } else hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; @@ -624,9 +622,7 @@ multiframe: if (time_before(hc->timeout_tl.expires - 5 * HZ, jiffies) || !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; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |