leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mISDN: Use mod_timer()

Browse Source 
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>
This commit is contained in:
Manuel Schölling 2014-05-21 22:08:48 +02:00 committed by David S. Miller
parent 0797fb083f
commit 87f03cc3c6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/isdn/mISDN/l1oip_core.c
View File

@ -287,11 +287,9 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
p = frame; p = frame;
/* restart timer */ /* restart timer */
if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) { if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ))
del_timer(&hc->keep_tl); mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ);
hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; else
add_timer(&hc->keep_tl);
} else
hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ;
if (debug & DEBUG_L1OIP_MSG) if (debug & DEBUG_L1OIP_MSG)
@ -623,9 +621,7 @@ multiframe:
/* restart timer */ /* restart timer */
if (time_before(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; hc->timeout_on = 1;
del_timer(&hc->timeout_tl); mod_timer(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ);
hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ;
add_timer(&hc->timeout_tl);
} else /* only adjust timer */ } else /* only adjust timer */
hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ; hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ;