浏览代码

tc35815: Mark carrier-off before starting PHY

Call netif_carrier_off() before starting PHY device.  This is a
behavior before converting to generic PHY layer.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Atsushi Nemoto 17 年之前
父节点
当前提交
59524a3744
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      drivers/net/tc35815.c

+ 2 - 0
drivers/net/tc35815.c

@@ -1394,6 +1394,7 @@ tc35815_open(struct net_device *dev)
 	tc35815_chip_init(dev);
 	tc35815_chip_init(dev);
 	spin_unlock_irq(&lp->lock);
 	spin_unlock_irq(&lp->lock);
 
 
+	netif_carrier_off(dev);
 	/* schedule a link state check */
 	/* schedule a link state check */
 	phy_start(lp->phy_dev);
 	phy_start(lp->phy_dev);
 
 
@@ -2453,6 +2454,7 @@ static int tc35815_resume(struct pci_dev *pdev)
 		return 0;
 		return 0;
 	pci_set_power_state(pdev, PCI_D0);
 	pci_set_power_state(pdev, PCI_D0);
 	tc35815_restart(dev);
 	tc35815_restart(dev);
+	netif_carrier_off(dev);
 	if (lp->phy_dev)
 	if (lp->phy_dev)
 		phy_start(lp->phy_dev);
 		phy_start(lp->phy_dev);
 	netif_device_attach(dev);
 	netif_device_attach(dev);