Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8b3d51 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Fix the initial device operstate 



Following commit 8f4cccbb ('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: default avatarBen Hutchings <bhutchings@solarflare.com>
parent adeb15aa

drivers/net/ethernet/sfc/efx.c

+3 −3
Original line number Diff line number Diff line
@@ -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);