diff options
-rw-r--r-- | drivers/net/spider_net.c | 14 | ||||
-rw-r--r-- | drivers/net/spider_net.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index c5d2cb834c09..e4a9bdd8d77c 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1909,26 +1909,26 @@ static void spider_net_link_phy(unsigned long data) | |||
1909 | 1909 | ||
1910 | pr_info("%s: link is down trying to bring it up\n", card->netdev->name); | 1910 | pr_info("%s: link is down trying to bring it up\n", card->netdev->name); |
1911 | 1911 | ||
1912 | switch (phy->medium) { | 1912 | switch (card->medium) { |
1913 | case GMII_COPPER: | 1913 | case BCM54XX_COPPER: |
1914 | /* enable fiber with autonegotiation first */ | 1914 | /* enable fiber with autonegotiation first */ |
1915 | if (phy->def->ops->enable_fiber) | 1915 | if (phy->def->ops->enable_fiber) |
1916 | phy->def->ops->enable_fiber(phy, 1); | 1916 | phy->def->ops->enable_fiber(phy, 1); |
1917 | phy->medium = GMII_FIBER; | 1917 | card->medium = BCM54XX_FIBER; |
1918 | break; | 1918 | break; |
1919 | 1919 | ||
1920 | case GMII_FIBER: | 1920 | case BCM54XX_FIBER: |
1921 | /* fiber didn't come up, try to disable fiber autoneg */ | 1921 | /* fiber didn't come up, try to disable fiber autoneg */ |
1922 | if (phy->def->ops->enable_fiber) | 1922 | if (phy->def->ops->enable_fiber) |
1923 | phy->def->ops->enable_fiber(phy, 0); | 1923 | phy->def->ops->enable_fiber(phy, 0); |
1924 | phy->medium = GMII_UNKNOWN; | 1924 | card->medium = BCM54XX_UNKNOWN; |
1925 | break; | 1925 | break; |
1926 | 1926 | ||
1927 | case GMII_UNKNOWN: | 1927 | case BCM54XX_UNKNOWN: |
1928 | /* copper, fiber with and without failed, | 1928 | /* copper, fiber with and without failed, |
1929 | * retry from beginning */ | 1929 | * retry from beginning */ |
1930 | spider_net_setup_aneg(card); | 1930 | spider_net_setup_aneg(card); |
1931 | phy->medium = GMII_COPPER; | 1931 | card->medium = BCM54XX_COPPER; |
1932 | break; | 1932 | break; |
1933 | } | 1933 | } |
1934 | 1934 | ||
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index e072a7cb66f5..f7d1310ff473 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h | |||
@@ -444,6 +444,8 @@ struct spider_net_card { | |||
444 | struct pci_dev *pdev; | 444 | struct pci_dev *pdev; |
445 | struct mii_phy phy; | 445 | struct mii_phy phy; |
446 | 446 | ||
447 | int medium; | ||
448 | |||
447 | void __iomem *regs; | 449 | void __iomem *regs; |
448 | 450 | ||
449 | struct spider_net_descr_chain tx_chain; | 451 | struct spider_net_descr_chain tx_chain; |