Commit d3a6abcc authored by Lijun Pan's avatar Lijun Pan Committed by David S. Miller
Browse files

ibmvnic: remove duplicate napi_schedule call in do_reset function 



During adapter reset, do_reset/do_hard_reset calls ibmvnic_open(),
which will calls napi_schedule if previous state is VNIC_CLOSED
(i.e, the reset case, and "ifconfig down" case). So there is no need
for do_reset to call napi_schedule again at the end of the function
though napi_schedule will neglect the request if napi is already
scheduled.

Fixes: ed651a10 ("ibmvnic: Updated reset handling")
Signed-off-by: default avatarLijun Pan <lijunp213@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0775ebc4

drivers/net/ethernet/ibm/ibmvnic.c

+1 −5
Original line number Diff line number Diff line
@@ -1921,7 +1921,7 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
	u64 old_num_rx_queues, old_num_tx_queues;

	u64 old_num_rx_slots, old_num_tx_slots;

	struct net_device *netdev = adapter->netdev;

	int i, rc;

	int rc;



	netdev_dbg(adapter->netdev,

		   "[S:%d FOP:%d] Reset reason %d, reset_state %d\n",
@@ -2110,10 +2110,6 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
	/* refresh device's multicast list */

	ibmvnic_set_multi(netdev);



	/* kick napi */

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

		napi_schedule(&adapter->napi[i]);



	if (adapter->reset_reason == VNIC_RESET_FAILOVER ||

	    adapter->reset_reason == VNIC_RESET_MOBILITY)

		__netdev_notify_peers(netdev);