spidernet: move medium variable into card struct
Subsystems (2)
PATCH 1/1 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 <[email protected]>
---
drivers/net/spider_net.c +7 -7
@@ -1912,26 +1912,26 @@ static void spider_net_link_phy(unsignedpr_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 ; }
drivers/net/spider_net.h +2 -0
@@ -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;
Quoted 4 lines · Jens Osterkamp
This moves the medium variable into the spidernet card structure. It renames the
GMII_variables to BCM54XX specific ones.Signed-off-by Jens Osterkamp <[email protected]>
Boot-tested the patch, it works for me
Acked-by Linas Vepstas <[email protected]>