diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-08-24 19:04:38 +0200 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-08-24 21:10:24 +0200 |
| commit | 8f8b3d518999fd1c342310910aa1e49112c86d05 (patch) | |
| tree | 7024fcb7301339f9c41100717e8bc982aa0ed790 /drivers/net/ethernet/sfc | |
| parent | sfc: Assign efx and efx->type as early as possible in efx_pci_probe() (diff) | |
| download | linux-8f8b3d518999fd1c342310910aa1e49112c86d05.tar.xz linux-8f8b3d518999fd1c342310910aa1e49112c86d05.zip | |
sfc: Fix the initial device operstate
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>
Diffstat (limited to 'drivers/net/ethernet/sfc')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 92f002029481..a606db43c5ba 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -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; @@ -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); |