Commit 3468656f authored Feb 06, 2018 by John Allen Committed by David S. Miller Feb 07, 2018

ibmvnic: Fix rx queue cleanup for non-fatal resets

At some point, a check was added to exit the polling routine during resets.
This makes sense for most reset conditions, but for a non-fatal error, we
expect the polling routine to continue running to properly clean up the rx
queues. This patch checks if we are performing a non-fatal reset and if we
are, continues normal polling operation.

Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bc6d33c8

drivers/net/ethernet/ibm/ibmvnic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1831,7 +1831,8 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
		u16 offset;
		u8 flags = 0;

		if (unlikely(adapter->resetting)) {
		if (unlikely(adapter->resetting &&
		adapter->reset_reason != VNIC_RESET_NON_FATAL)) {
		enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
		napi_complete_done(napi, frames_processed);
		return frames_processed;