tc35815: Mark carrier-off before starting PHY
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Wed, 25 Jun 2008 02:41:01 +0000 (11:41 +0900)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 27 Jun 2008 05:27:33 +0000 (01:27 -0400)
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>
drivers/net/tc35815.c

index 10e4e85da3fcae7af7e9435145f06dad72abd35f..dccea525165ef0c84b4ced4b4ce27393b8ae558d 100644 (file)
@@ -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);