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
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
net
/
tulip
/
media.c
diff --git
a/drivers/net/tulip/media.c
b/drivers/net/tulip/media.c
index
091a0e0
..
919c40c
100644
(file)
--- a/
drivers/net/tulip/media.c
+++ b/
drivers/net/tulip/media.c
@@
-88,7
+88,7
@@
int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
value = ioread32(ioaddr + CSR9);
iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
value = ioread32(ioaddr + CSR9);
iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
- value = (phy_id << 21) | (location << 16) | 0x
80
000000;
+ value = (phy_id << 21) | (location << 16) | 0x
08
000000;
iowrite32(value, ioaddr + CSR10);
while(--i > 0) {
iowrite32(value, ioaddr + CSR10);
while(--i > 0) {
@@
-166,7
+166,7
@@
void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
value = ioread32(ioaddr + CSR9);
iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
value = ioread32(ioaddr + CSR9);
iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
- value = (phy_id << 21) | (location << 16) | 0x
40
000000 | (val & 0xFFFF);
+ value = (phy_id << 21) | (location << 16) | 0x
04
000000 | (val & 0xFFFF);
iowrite32(value, ioaddr + CSR10);
while(--i > 0) {
iowrite32(value, ioaddr + CSR10);
while(--i > 0) {
@@
-174,6
+174,7
@@
void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
break;
}
spin_unlock_irqrestore(&tp->mii_lock, flags);
break;
}
spin_unlock_irqrestore(&tp->mii_lock, flags);
+ return;
}
/* Establish sync by sending 32 logic ones. */
}
/* Establish sync by sending 32 logic ones. */