Skip to content

Commit

Permalink
ibmvnic: register netdev after init of adapter
Browse files Browse the repository at this point in the history
Finish initializing the adapter before registering netdev so state
is consistent.

Fixes: c26eba0 ("ibmvnic: Update reset infrastructure to support tunable parameters")
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sukadev Bhattiprolu authored and David S. Miller committed Feb 25, 2022
1 parent 36491f2 commit 570425f
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/net/ethernet/ibm/ibmvnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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:
Expand Down

0 comments on commit 570425f

Please sign in to comment.