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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
arm
/
etherh.c
diff --git
a/drivers/net/arm/etherh.c
b/drivers/net/arm/etherh.c
index
d52deb8
..
6a93b66
100644
(file)
--- a/
drivers/net/arm/etherh.c
+++ b/
drivers/net/arm/etherh.c
@@
-46,7
+46,6
@@
#include <linux/device.h>
#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/device.h>
#include <linux/init.h>
#include <linux/bitops.h>
-#include <linux/jiffies.h>
#include <asm/system.h>
#include <asm/ecard.h>
#include <asm/system.h>
#include <asm/ecard.h>
@@
-356,7
+355,7
@@
etherh_block_output (struct net_device *dev, int count, const unsigned char *buf
dma_start = jiffies;
while ((readb (addr + EN0_ISR) & ENISR_RDC) == 0)
dma_start = jiffies;
while ((readb (addr + EN0_ISR) & ENISR_RDC) == 0)
- if (
time_after(jiffies, dma_start + 2*HZ/100)
) { /* 20ms */
+ if (
jiffies - dma_start > 2*HZ/100
) { /* 20ms */
printk(KERN_ERR "%s: timeout waiting for TX RDC\n",
dev->name);
etherh_reset (dev);
printk(KERN_ERR "%s: timeout waiting for TX RDC\n",
dev->name);
etherh_reset (dev);