[KJ] Patch:replace with time_after in drivers/net/eexpress.c

[KJ] Patch:replace with time_after in drivers/net/eexpress.c

[Shani]

Hi,

Replacing with time_after in drivers/net/eexpress.c
Applies and compiles clean on latest tree.Not tested.

thanks.

Signed-off-by: Shani Moideen <shani.moideen@wipro.com>
----

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 3868b80..7825f78 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",
@@ -1650,7 +1651,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);

-- 
Shani Moideen

Re: Patch:replace with time_after in drivers/net/eexpress.c

[Alan Cox]

On Wed, Mar 28, 2007 at 10:44:31AM +0530, Shani wrote:
> Hi,
> 
> Replacing with time_after in drivers/net/eexpress.c
> Applies and compiles clean on latest tree.Not tested.
> 
> thanks.
> 
> Signed-off-by: Shani Moideen <shani.moideen@wipro.com>

NAK as not tested. The existing code is known to work so ugly or not
it is better than untested changes

Re: Patch:replace with time_after in drivers/net/eexpress.c

[Jeff Garzik]

Shani wrote:
> Hi,
> 
> Replacing with time_after in drivers/net/eexpress.c
> Applies and compiles clean on latest tree.Not tested.
> 
> thanks.
> 
> Signed-off-by: Shani Moideen <shani.moideen@wipro.com>

applied to #upstream

Re: [KJ] Patch:replace with time_after in drivers/net/eexpress.c

[Marcin Ślusarz]

2007/3/28, Shani <shani.moideen@wipro.com>:
> @@ -1650,7 +1651,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);
>
it should be time_before, not time_after...