diff options
| author | Shani <shani.moideen@wipro.com> | 2007-03-28 07:14:31 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 17:01:03 +0200 |
| commit | d7ef45b04905468b08e36b43dbce5b1de496e682 (patch) | |
| tree | a693fc57b71541e7244633b4d1b72ad8e2e3e55a /drivers/net/eexpress.c | |
| parent | ehea: removing unused functionality (diff) | |
| download | linux-d7ef45b04905468b08e36b43dbce5b1de496e682.tar.xz linux-d7ef45b04905468b08e36b43dbce5b1de496e682.zip | |
Patch:replace with time_after in drivers/net/eexpress.c
Replacing with time_after in drivers/net/eexpress.c
Applies and compiles clean on latest tree.Not tested.
Signed-off-by: Shani Moideen <shani.moideen@wipro.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/eexpress.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 8aaf5ec0c360..2600e2c27a82 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -115,6 +115,7 @@ #include <linux/mca-legacy.h> #include <linux/spinlock.h> #include <linux/bitops.h> +#include <linux/jiffies.h> #include <asm/system.h> #include <asm/io.h> @@ -556,7 +557,7 @@ static void unstick_cu(struct net_device *dev) if (lp->started) { - if ((jiffies - dev->trans_start)>50) + if (time_after(jiffies, dev->trans_start + 50)) { if (lp->tx_link==lp->last_tx_restart) { @@ -612,7 +613,7 @@ static void unstick_cu(struct net_device *dev) } else { - if ((jiffies-lp->init_time)>10) + if (time_after(jiffies, lp->init_time + 10)) { unsigned short status = scb_status(dev); printk(KERN_WARNING "%s: i82586 startup timed out, status %04x, resetting...\n", @@ -1649,7 +1650,7 @@ eexp_set_multicast(struct net_device *dev) #endif oj = jiffies; while ((SCB_CUstat(scb_status(dev)) == 2) && - ((jiffies-oj) < 2000)); + (time_after(jiffies, oj + 2000))); if (SCB_CUstat(scb_status(dev)) == 2) printk("%s: warning, CU didn't stop\n", dev->name); lp->started &= ~(STARTED_CU); |