Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0797fb08 authored by Manuel Schölling's avatar Manuel Schölling Committed by David S. Miller
Browse files

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: default avatarManuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b3d9655

drivers/isdn/mISDN/l1oip_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) 
		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;