Skip to content

Commit

Permalink
sfc: Fix the initial device operstate
Browse files Browse the repository at this point in the history
Following commit 8f4cccb ('net: Set device operstate at registration
time') it is now correct and preferable to set the carrier off before
registering a device.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
  • Loading branch information
Ben Hutchings committed Aug 24, 2012
1 parent adeb15a commit 8f8b3d5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/sfc/efx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2120,6 +2120,9 @@ static int efx_register_netdev(struct efx_nic *efx)
goto fail_locked;
efx_update_name(efx);

/* Always start with carrier off; PHY events will detect the link */
netif_carrier_off(net_dev);

rc = register_netdevice(net_dev);
if (rc)
goto fail_locked;
Expand All @@ -2130,9 +2133,6 @@ static int efx_register_netdev(struct efx_nic *efx)
efx_init_tx_queue_core_txq(tx_queue);
}

/* Always start with carrier off; PHY events will detect the link */
netif_carrier_off(net_dev);

rtnl_unlock();

rc = device_create_file(&efx->pci_dev->dev, &dev_attr_phy_type);
Expand Down

0 comments on commit 8f8b3d5

Please sign in to comment.