diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
| commit | 03a49eebcaa3486f4ac2c50db83aab996ce5ad9b (patch) | |
| tree | a92d8a6b3806ec3416ca2b28c45174fca9c4833e /drivers/net/oaknet.c | |
| parent | d4fbeabbc9e68c80738fe59135d201c3ed5fe40f (diff) | |
| parent | 26df54bffd90977fbc6fe8284f2beaed19fea44f (diff) | |
| download | kernel-crypto-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.tar.gz kernel-crypto-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.tar.xz kernel-crypto-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.zip | |
Merge branch 'janitor'
Diffstat (limited to 'drivers/net/oaknet.c')
| -rw-r--r-- | drivers/net/oaknet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/oaknet.c b/drivers/net/oaknet.c index 62167a29deb..d0f686d6eaa 100644 --- 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/jiffies.h> #include <asm/board.h> #include <asm/io.h> @@ -606,7 +607,7 @@ retry: #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); |