mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-18 01:34:14 +08:00
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>
This commit is contained in:
parent
bc6d33c8d9
commit
3468656fd7
@ -1831,7 +1831,8 @@ restart_poll:
|
|||||||
u16 offset;
|
u16 offset;
|
||||||
u8 flags = 0;
|
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]);
|
enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
|
||||||
napi_complete_done(napi, frames_processed);
|
napi_complete_done(napi, frames_processed);
|
||||||
return frames_processed;
|
return frames_processed;
|
||||||
|
Loading…
Reference in New Issue
Block a user