[patch 1/7] drivers/net/tulip/pnic.c : Use of time_after macro

[domen]

From: Marcelo Feitoza Parisi <[EMAIL PROTECTED]>


Use of time_after() macro, defined at linux/jiffies.h, which deal with
wrapping correctly and are nicer to read.

Signed-off-by: Marcelo Feitoza Parisi <[EMAIL PROTECTED]>
Signed-off-by: Domen Puncer <[EMAIL PROTECTED]>

---
 pnic.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: quilt/drivers/net/tulip/pnic.c
===================================================================
--- quilt.orig/drivers/net/tulip/pnic.c
+++ quilt/drivers/net/tulip/pnic.c
@@ -16,6 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/jiffies.h>
 #include "tulip.h"
 
 
@@ -68,7 +69,8 @@ void pnic_lnk_change(struct net_device *
                 */
                if (tulip_media_cap[dev->if_port] & MediaIsMII)
                        return;
-               if (! tp->nwayset  ||  jiffies - dev->trans_start > 1*HZ) {
+               if (!tp->nwayset ||
+                               time_after(jiffies, dev->trans_start + 1*HZ)) {
                        tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff);
                        iowrite32(tp->csr6, ioaddr + CSR6);
                        iowrite32(0x30, ioaddr + CSR12);

--
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html