diff --git a/[refs] b/[refs] index 73d402e87501..bfa0ff711ad3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f471f92339860c35b561cf45ad563ab1ff07c386 +refs/heads/master: 59524a37446e18a672188d86d23c8c76fd488621 diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c index 10e4e85da3fc..dccea525165e 100644 --- a/trunk/drivers/net/tc35815.c +++ b/trunk/drivers/net/tc35815.c @@ -1394,6 +1394,7 @@ tc35815_open(struct net_device *dev) tc35815_chip_init(dev); spin_unlock_irq(&lp->lock); + netif_carrier_off(dev); /* schedule a link state check */ phy_start(lp->phy_dev); @@ -2453,6 +2454,7 @@ static int tc35815_resume(struct pci_dev *pdev) return 0; pci_set_power_state(pdev, PCI_D0); tc35815_restart(dev); + netif_carrier_off(dev); if (lp->phy_dev) phy_start(lp->phy_dev); netif_device_attach(dev);