aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2006-06-22 18:47:06 -0400
committerFrancois Romieu <romieu@electric-eye.fr.zoreil.com>2006-06-22 19:18:35 -0400
commit8a22dddb2a5b5834577afd9e25b5392218715611 (patch)
tree987fb5c1b8a6ce4d0437b675909e4505a09144d7
parent612eff0e3715a6faff5ba1b74873b99e036c59fe (diff)
via-velocity: the link is not correctly detected when the device starts
The patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=6711 Signed-off-by: Roy Marples <uberlord@gentoo.org> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
-rw-r--r--drivers/net/via-velocity.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2eb6b5f9ba0d..09e05fe40c38 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -248,6 +248,7 @@ static void velocity_free_rd_ring(struct velocity_info *vptr);
248static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *); 248static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);
249static int velocity_soft_reset(struct velocity_info *vptr); 249static int velocity_soft_reset(struct velocity_info *vptr);
250static void mii_init(struct velocity_info *vptr, u32 mii_status); 250static void mii_init(struct velocity_info *vptr, u32 mii_status);
251static u32 velocity_get_link(struct net_device *dev);
251static u32 velocity_get_opt_media_mode(struct velocity_info *vptr); 252static u32 velocity_get_opt_media_mode(struct velocity_info *vptr);
252static void velocity_print_link_status(struct velocity_info *vptr); 253static void velocity_print_link_status(struct velocity_info *vptr);
253static void safe_disable_mii_autopoll(struct mac_regs __iomem * regs); 254static void safe_disable_mii_autopoll(struct mac_regs __iomem * regs);
@@ -798,6 +799,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
798 if (ret < 0) 799 if (ret < 0)
799 goto err_iounmap; 800 goto err_iounmap;
800 801
802 if (velocity_get_link(dev))
803 netif_carrier_off(dev);
804
801 velocity_print_info(vptr); 805 velocity_print_info(vptr);
802 pci_set_drvdata(pdev, dev); 806 pci_set_drvdata(pdev, dev);
803 807
@@ -1653,8 +1657,10 @@ static void velocity_error(struct velocity_info *vptr, int status)
1653 1657
1654 if (linked) { 1658 if (linked) {
1655 vptr->mii_status &= ~VELOCITY_LINK_FAIL; 1659 vptr->mii_status &= ~VELOCITY_LINK_FAIL;
1660 netif_carrier_on(vptr->dev);
1656 } else { 1661 } else {
1657 vptr->mii_status |= VELOCITY_LINK_FAIL; 1662 vptr->mii_status |= VELOCITY_LINK_FAIL;
1663 netif_carrier_off(vptr->dev);
1658 } 1664 }
1659 1665
1660 velocity_print_link_status(vptr); 1666 velocity_print_link_status(vptr);