@@ -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;
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(-)