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
/
tulip.h
diff --git
a/drivers/net/tulip/tulip.h
b/drivers/net/tulip/tulip.h
index
20346d8
..
05d2d96
100644
(file)
--- a/
drivers/net/tulip/tulip.h
+++ b/
drivers/net/tulip/tulip.h
@@
-88,7
+88,6
@@
enum chips {
I21145,
DM910X,
CONEXANT,
I21145,
DM910X,
CONEXANT,
- ULI526X
};
};
@@
-482,11
+481,8
@@
static inline void tulip_stop_rxtx(struct tulip_private *tp)
static inline void tulip_restart_rxtx(struct tulip_private *tp)
{
static inline void tulip_restart_rxtx(struct tulip_private *tp)
{
- if(!(tp->chip_id == ULI526X &&
- (tp->revision == 0x40 || tp->revision == 0x50))) {
- tulip_stop_rxtx(tp);
- udelay(5);
- }
+ tulip_stop_rxtx(tp);
+ udelay(5);
tulip_start_rxtx(tp);
}
tulip_start_rxtx(tp);
}