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
/
tulip
/
pnic.c
diff --git
a/drivers/net/tulip/pnic.c
b/drivers/net/tulip/pnic.c
index
d9980bd
..
ca7e532
100644
(file)
--- a/
drivers/net/tulip/pnic.c
+++ b/
drivers/net/tulip/pnic.c
@@
-16,6
+16,7
@@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/pci.h>
+#include <linux/jiffies.h>
#include "tulip.h"
#include "tulip.h"
@@
-68,7
+69,7
@@
void pnic_lnk_change(struct net_device *dev, int csr5)
*/
if (tulip_media_cap[dev->if_port] & MediaIsMII)
return;
*/
if (tulip_media_cap[dev->if_port] & MediaIsMII)
return;
- if (! tp->nwayset ||
jiffies - dev->trans_start > 1*HZ
) {
+ if (! tp->nwayset ||
time_after(jiffies, dev->trans_start + 1*HZ)
) {
tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff);
iowrite32(tp->csr6, ioaddr + CSR6);
iowrite32(0x30, ioaddr + CSR12);
tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff);
iowrite32(tp->csr6, ioaddr + CSR6);
iowrite32(0x30, ioaddr + CSR12);