From dde7ea2f793ba1fa6748ddc75d52324c4e4d39cf Mon Sep 17 00:00:00 2001
From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Date: Fri, 15 Jul 2005 10:00:41 -0700
Subject: [PATCH] --- yaml --- r: 4901 b: refs/heads/master c:
 4851d3aaa550b7b62553dd19fcadc7b586da4f17 h: refs/heads/master i:   4899:
 dcb9f5afc93de6b3b9977b9e10f2cc92ce3fb56c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/pcmcia/smc91c92_cs.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6b91ebbc1df0..7f1418ad0062 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8178345c4f12f4413e5620fc86a6b0381c41bc9
+refs/heads/master: 4851d3aaa550b7b62553dd19fcadc7b586da4f17
diff --git a/trunk/drivers/net/pcmcia/smc91c92_cs.c b/trunk/drivers/net/pcmcia/smc91c92_cs.c
index fbc2f58ff688..0d8bb4cccbb7 100644
--- a/trunk/drivers/net/pcmcia/smc91c92_cs.c
+++ b/trunk/drivers/net/pcmcia/smc91c92_cs.c
@@ -41,6 +41,7 @@
 #include <linux/ioport.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/jiffies.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -2092,7 +2093,7 @@ static void media_check(u_long arg)
     }
 
     /* Ignore collisions unless we've had no rx's recently */
-    if (jiffies - dev->last_rx > HZ) {
+    if (time_after(jiffies, dev->last_rx + HZ)) {
 	if (smc->tx_err || (smc->media_status & EPH_16COL))
 	    media |= EPH_16COL;
     }