projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[powerpc.git]
/
drivers
/
net
/
ne2.c
diff --git
a/drivers/net/ne2.c
b/drivers/net/ne2.c
index
e6df375
..
2aa7b77
100644
(file)
--- a/
drivers/net/ne2.c
+++ b/
drivers/net/ne2.c
@@
-75,6
+75,7
@@
static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.o
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/bitops.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/bitops.h>
+#include <linux/jiffies.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/system.h>
#include <asm/io.h>
@@
-395,7
+396,7
@@
static int __init ne2_probe1(struct net_device *dev, int slot)
outb(inb(base_addr + NE_RESET), base_addr + NE_RESET);
while ((inb_p(base_addr + EN0_ISR) & ENISR_RESET) == 0)
outb(inb(base_addr + NE_RESET), base_addr + NE_RESET);
while ((inb_p(base_addr + EN0_ISR) & ENISR_RESET) == 0)
- if (
jiffies - reset_start_time > 2*HZ/100
) {
+ if (
time_after(jiffies, reset_start_time + 2*HZ/100)
) {
printk(" not found (no reset ack).\n");
retval = -ENODEV;
goto out;
printk(" not found (no reset ack).\n");
retval = -ENODEV;
goto out;
@@
-548,7
+549,7
@@
static void ne_reset_8390(struct net_device *dev)
/* This check _should_not_ be necessary, omit eventually. */
while ((inb_p(NE_BASE+EN0_ISR) & ENISR_RESET) == 0)
/* This check _should_not_ be necessary, omit eventually. */
while ((inb_p(NE_BASE+EN0_ISR) & ENISR_RESET) == 0)
- if (
jiffies - reset_start_time > 2*HZ/100
) {
+ if (
time_after(jiffies, reset_start_time + 2*HZ/100)
) {
printk("%s: ne_reset_8390() did not complete.\n",
dev->name);
break;
printk("%s: ne_reset_8390() did not complete.\n",
dev->name);
break;
@@
-749,7
+750,7
@@
retry:
#endif
while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0)
#endif
while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0)
- if (
jiffies - dma_start > 2*HZ/100) {
/* 20ms */
+ if (
time_after(jiffies, dma_start + 2*HZ/100)) {
/* 20ms */
printk("%s: timeout waiting for Tx RDC.\n", dev->name);
ne_reset_8390(dev);
NS8390_init(dev,1);
printk("%s: timeout waiting for Tx RDC.\n", dev->name);
ne_reset_8390(dev);
NS8390_init(dev,1);