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

Commit 555cf23d authored by Lijun Pan's avatar Lijun Pan Committed by Greg Kroah-Hartman
Browse files

ibmvnic: remove duplicate napi_schedule call in do_reset function 



commit d3a6abccbd272aea7dc2c6f984bb5a2c11278e44 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2601cdb1

drivers/net/ethernet/ibm/ibmvnic.c

+1 −5
Original line number Diff line number Diff line
@@ -1760,7 +1760,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, "Re-setting driver (%d)\n",

		   rwi->reset_reason);
@@ -1878,10 +1878,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_CHANGE_PARAM) {

		call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);