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

Commit cc85c02e authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Wait until reset is complete to set carrier on 



Pushes back setting the carrier on until the end of the reset
code. This resolves a bug where a watchdog timer was detecting
that a TX queue had stalled before the adapter reset was complete.

Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6dbe939

drivers/net/ethernet/ibm/ibmvnic.c

+2 −2
Original line number Diff line number Diff line
@@ -1670,8 +1670,6 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
		return 0;

	}



	netif_carrier_on(netdev);



	/* kick napi */

	for (i = 0; i < adapter->req_rx_queues; i++)

		napi_schedule(&adapter->napi[i]);
@@ -1679,6 +1677,8 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
	if (adapter->reset_reason != VNIC_RESET_FAILOVER)

		netdev_notify_peers(netdev);



	netif_carrier_on(netdev);



	return 0;

}