Skip to content

Commit 3468656

Browse files
jallen93davem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bc6d33c commit 3468656

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,8 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
18311831
u16 offset;
18321832
u8 flags = 0;
18331833

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

0 commit comments

Comments
 (0)