OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spidernet: move medium variable into card struct 

This moves the medium variable into the spidernet card structure.
It renames the GMII_ variables to BCM54XX specific ones.

Signed-off-by: Jens Osterkamp <jens@de.ibm.com>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jens Osterkamp 2007-02-20 16:39:13 -06:00 committed by Jeff Garzik
parent fc8e13da91
commit 4b23a554db
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/spider_net.c
View File

@ -1909,26 +1909,26 @@ static void spider_net_link_phy(unsigned long data)
pr_info("%s: link is down trying to bring it up\n", card->netdev->name);
switch (phy->medium) {
case GMII_COPPER:
switch (card->medium) {
case BCM54XX_COPPER:
/* enable fiber with autonegotiation first */
if (phy->def->ops->enable_fiber)
phy->def->ops->enable_fiber(phy, 1);
phy->medium = GMII_FIBER;
card->medium = BCM54XX_FIBER;
break;
case GMII_FIBER:
case BCM54XX_FIBER:
/* fiber didn't come up, try to disable fiber autoneg */
if (phy->def->ops->enable_fiber)
phy->def->ops->enable_fiber(phy, 0);
phy->medium = GMII_UNKNOWN;
card->medium = BCM54XX_UNKNOWN;
break;
case GMII_UNKNOWN:
case BCM54XX_UNKNOWN:
/* copper, fiber with and without failed,
* retry from beginning */
spider_net_setup_aneg(card);
phy->medium = GMII_COPPER;
card->medium = BCM54XX_COPPER;
break;
}

2
drivers/net/spider_net.h
View File

@ -444,6 +444,8 @@ struct spider_net_card {
struct pci_dev *pdev;
struct mii_phy phy;
int medium;
void __iomem *regs;
struct spider_net_descr_chain tx_chain;