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
/
tokenring
/
lanstreamer.c
diff --git
a/drivers/net/tokenring/lanstreamer.c
b/drivers/net/tokenring/lanstreamer.c
index
28d968f
..
97712c3
100644
(file)
--- a/
drivers/net/tokenring/lanstreamer.c
+++ b/
drivers/net/tokenring/lanstreamer.c
@@
-100,6
+100,7
@@
#define STREAMER_IOCTL 0
#define STREAMER_IOCTL 0
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-121,7
+122,6
@@
#include <linux/spinlock.h>
#include <linux/version.h>
#include <linux/bitops.h>
#include <linux/spinlock.h>
#include <linux/version.h>
#include <linux/bitops.h>
-#include <linux/jiffies.h>
#include <net/checksum.h>
#include <net/checksum.h>
@@
-512,7
+512,7
@@
static int streamer_reset(struct net_device *dev)
while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) {
msleep_interruptible(100);
while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) {
msleep_interruptible(100);
- if (
time_after(jiffies, t + 40 * HZ)
) {
+ if (
jiffies - t > 40 * HZ
) {
printk(KERN_ERR
"IBM PCI tokenring card not responding\n");
release_region(dev->base_addr, STREAMER_IO_SPACE);
printk(KERN_ERR
"IBM PCI tokenring card not responding\n");
release_region(dev->base_addr, STREAMER_IO_SPACE);
@@
-601,7
+601,7
@@
static int streamer_open(struct net_device *dev)
rc=streamer_reset(dev);
}
rc=streamer_reset(dev);
}
- if (request_irq(dev->irq, &streamer_interrupt,
IRQF_SHARED
, "lanstreamer", dev)) {
+ if (request_irq(dev->irq, &streamer_interrupt,
SA_SHIRQ
, "lanstreamer", dev)) {
return -EAGAIN;
}
#if STREAMER_DEBUG
return -EAGAIN;
}
#if STREAMER_DEBUG