Commit 570425f8 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by David S. Miller
Browse files

ibmvnic: register netdev after init of adapter 



Finish initializing the adapter before registering netdev so state
is consistent.

Fixes: c26eba03 ("ibmvnic: Update reset infrastructure to support tunable parameters")
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36491f2d

drivers/net/ethernet/ibm/ibmvnic.c

+8 −6
Original line number Diff line number Diff line
@@ -5826,12 +5826,6 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) 
		goto ibmvnic_dev_file_err;



	netif_carrier_off(netdev);

	rc = register_netdev(netdev);

	if (rc) {

		dev_err(&dev->dev, "failed to register netdev rc=%d\n", rc);

		goto ibmvnic_register_fail;

	}

	dev_info(&dev->dev, "ibmvnic registered\n");



	if (init_success) {

		adapter->state = VNIC_PROBED;
@@ -5844,6 +5838,14 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) 


	adapter->wait_for_reset = false;

	adapter->last_reset_time = jiffies;



	rc = register_netdev(netdev);

	if (rc) {

		dev_err(&dev->dev, "failed to register netdev rc=%d\n", rc);

		goto ibmvnic_register_fail;

	}

	dev_info(&dev->dev, "ibmvnic registered\n");



	return 0;



ibmvnic_register_fail: