git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
oaknet.c
diff --git
a/drivers/net/oaknet.c
b/drivers/net/oaknet.c
index
62167a2
..
d0f686d
100644
(file)
--- a/
drivers/net/oaknet.c
+++ b/
drivers/net/oaknet.c
@@
-20,6
+20,7
@@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
#include <asm/board.h>
#include <asm/io.h>
#include <asm/board.h>
#include <asm/io.h>
@@
-606,7
+607,7
@@
retry:
#endif
while ((ei_ibp(base + EN0_ISR) & ENISR_RDC) == 0) {
#endif
while ((ei_ibp(base + EN0_ISR) & ENISR_RDC) == 0) {
- if (
jiffies - start > OAKNET_WAIT
) {
+ if (
time_after(jiffies, start + OAKNET_WAIT)
) {
printk("%s: timeout waiting for Tx RDC.\n", dev->name);
oaknet_reset_8390(dev);
NS8390_init(dev, TRUE);
printk("%s: timeout waiting for Tx RDC.\n", dev->name);
oaknet_reset_8390(dev);
NS8390_init(dev, TRUE);