Skip to content

Commit

Permalink
ibmvnic: register netdev after init of adapter
Browse files Browse the repository at this point in the history
commit 570425f upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
sukadev authored and gregkh committed Mar 8, 2022
1 parent fb38200 commit a4d7ea5
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/net/ethernet/ibm/ibmvnic.c
Expand Up @@ -5811,12 +5811,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 @@ -5829,6 +5823,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 a4d7ea5

Please sign in to comment.