Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d7ef45b04905468b08e36b43dbce5b1de496e682
Commit:     d7ef45b04905468b08e36b43dbce5b1de496e682
Parent:     acbddb591ba76bb20204fd6a407cb87d3f5f751e
Author:     Shani <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 28 10:44:31 2007 +0530
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 11:01:03 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 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 8aaf5ec..2600e2c 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to