dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[PATCH] network: pcnet_cs.c: remove unnecessary 'mdio_reset' 

'mdio_reset' has bad side effects that moves the phy_id.
DL10022-based cards work properly without 'mdio_reset'.

 Signed-off-by: komurojun-mbn@nifty.com

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Komuro 2006-07-23 10:20:55 +09:00 committed by Jeff Garzik
parent 242898be7a
commit fcf194d19b
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/pcmcia/pcnet_cs.c
View File

@ -654,11 +654,8 @@ static int pcnet_config(struct pcmcia_device *link)
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
if (info->flags & (IS_DL10019|IS_DL10022)) {
u_char id = inb(dev->base_addr + 0x1a);
dev->do_ioctl = &ei_ioctl;
mii_phy_probe(dev);
if ((id == 0x30) && !info->pna_phy && (info->eth_phy == 4))
info->eth_phy = 0;
}
link->dev_node = &info->node;
@ -821,15 +818,6 @@ static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value)
}
}
static void mdio_reset(kio_addr_t addr, int phy_id)
{
outb_p(0x08, addr);
outb_p(0x0c, addr);
outb_p(0x08, addr);
outb_p(0x0c, addr);
outb_p(0x00, addr);
}
/*======================================================================
EEPROM access routines for DL10019 and DL10022 based cards
@ -942,7 +930,8 @@ static void set_misc_reg(struct net_device *dev)
}
if (info->flags & IS_DL10022) {
if (info->flags & HAS_MII) {
mdio_reset(nic_base + DLINK_GPIO, info->eth_phy);
/* Advertise 100F, 100H, 10F, 10H */
mdio_write(nic_base + DLINK_GPIO, info->eth_phy, 4, 0x01e1);
/* Restart MII autonegotiation */
mdio_write(nic_base + DLINK_GPIO, info->eth_phy, 0, 0x0000);
mdio_write(nic_base + DLINK_GPIO, info->eth_phy, 0, 0x1200);