Commit 49963eed authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ibmvnic-napi-fixes' 



Lijun Pan says:

====================
ibmvnic: correctly call NAPI APIs

This series correct some misuse of NAPI APIs in the driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 453a7789 7c451f3e

drivers/net/ethernet/ibm/ibmvnic.c

+2 −12
Original line number Diff line number Diff line
@@ -1149,19 +1149,13 @@ static int __ibmvnic_open(struct net_device *netdev) 


	rc = set_link_state(adapter, IBMVNIC_LOGICAL_LNK_UP);

	if (rc) {

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

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

		ibmvnic_napi_disable(adapter);

		release_resources(adapter);

		return rc;

	}



	netif_tx_start_all_queues(netdev);



	if (prev_state == VNIC_CLOSED) {

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

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

	}



	adapter->state = VNIC_OPEN;

	return rc;

}
@@ -1922,7 +1916,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",
@@ -2111,10 +2105,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);