Commit af57d238 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream

parents 39105890 8a22dddb
...@@ -248,6 +248,7 @@ static void velocity_free_rd_ring(struct velocity_info *vptr); ...@@ -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 void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);
static int velocity_soft_reset(struct velocity_info *vptr); static int velocity_soft_reset(struct velocity_info *vptr);
static void mii_init(struct velocity_info *vptr, u32 mii_status); 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 u32 velocity_get_opt_media_mode(struct velocity_info *vptr);
static void velocity_print_link_status(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); 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 ...@@ -798,6 +799,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
if (ret < 0) if (ret < 0)
goto err_iounmap; goto err_iounmap;
if (velocity_get_link(dev))
netif_carrier_off(dev);
velocity_print_info(vptr); velocity_print_info(vptr);
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
...@@ -1653,8 +1657,10 @@ static void velocity_error(struct velocity_info *vptr, int status) ...@@ -1653,8 +1657,10 @@ static void velocity_error(struct velocity_info *vptr, int status)
if (linked) { if (linked) {
vptr->mii_status &= ~VELOCITY_LINK_FAIL; vptr->mii_status &= ~VELOCITY_LINK_FAIL;
netif_carrier_on(vptr->dev);
} else { } else {
vptr->mii_status |= VELOCITY_LINK_FAIL; vptr->mii_status |= VELOCITY_LINK_FAIL;
netif_carrier_off(vptr->dev);
} }
velocity_print_link_status(vptr); velocity_print_link_status(vptr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment