diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2006-06-23 00:47:06 +0200 |
|---|---|---|
| committer | Francois Romieu <romieu@electric-eye.fr.zoreil.com> | 2006-06-23 01:18:35 +0200 |
| commit | 8a22dddb2a5b5834577afd9e25b5392218715611 (patch) | |
| tree | 987fb5c1b8a6ce4d0437b675909e4505a09144d7 /drivers/net | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| download | linux-3.10-8a22dddb2a5b5834577afd9e25b5392218715611.tar.gz linux-3.10-8a22dddb2a5b5834577afd9e25b5392218715611.tar.bz2 linux-3.10-8a22dddb2a5b5834577afd9e25b5392218715611.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/via-velocity.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 2eb6b5f9ba0..09e05fe40c3 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); static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *); static int velocity_soft_reset(struct velocity_info *vptr); static void mii_init(struct velocity_info *vptr, u32 mii_status); +static u32 velocity_get_link(struct net_device *dev); static u32 velocity_get_opt_media_mode(struct velocity_info *vptr); static void velocity_print_link_status(struct velocity_info *vptr); static 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 if (ret < 0) goto err_iounmap; + if (velocity_get_link(dev)) + netif_carrier_off(dev); + velocity_print_info(vptr); pci_set_drvdata(pdev, dev); @@ -1653,8 +1657,10 @@ static void velocity_error(struct velocity_info *vptr, int status) if (linked) { vptr->mii_status &= ~VELOCITY_LINK_FAIL; + netif_carrier_on(vptr->dev); } else { vptr->mii_status |= VELOCITY_LINK_FAIL; + netif_carrier_off(vptr->dev); } velocity_print_link_status(vptr); |