From 32d3d6e8ac5c34598d77cff919e7cbcfb0934038 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 6 Feb 2002 18:20:57 -0500 Subject: [PATCH] Jiffies wrap cleanup for the slip net driver. Contributor: somebody from lkml, Tim ?. --- drivers/net/slip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 7b6186fc87b9..4bf23c2f838e 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -483,7 +483,7 @@ static void sl_tx_timeout(struct net_device *dev) * 14 Oct 1994 Dmitry Gorodchanin. */ #ifdef SL_CHECK_TRANSMIT - if (jiffies - dev->trans_start < 20 * HZ) { + if (time_before(jiffies, dev->trans_start + 20 * HZ)) { /* 20 sec timeout not reached */ goto out; } @@ -1387,7 +1387,7 @@ cleanup_module(void) int i; if (slip_ctrls != NULL) { - unsigned long start = jiffies; + unsigned long timeout = jiffies + HZ; int busy = 0; /* First of all: check for active disciplines and hangup them. @@ -1410,7 +1410,7 @@ cleanup_module(void) spin_unlock(&slc->ctrl.lock); } local_bh_enable(); - } while (busy && jiffies - start < 1*HZ); + } while (busy && time_before(jiffies, timeout)); busy = 0; for (i = 0; i < slip_maxdev; i++) { -- 2.39.5