ibmvnic: Fix rx queue cleanup for non-fatal resets
"Linux Kernel Mailing List" <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.head |
|---|---|
| Message-ID | <[email protected]> |
Web: https://git.kernel.org/torvalds/c/3468656fd7599b0cb1092bb1ee717d1a984e93ee Commit: 3468656fd7599b0cb1092bb1ee717d1a984e93ee Parent: bc6d33c8d93f5999920e97a8c6330b8910053d4f Refname: refs/heads/master Author: John Allen <[email protected]> AuthorDate: Tue Feb 6 16:21:49 2018 -0600 Committer: David S. Miller <[email protected]> CommitDate: Wed Feb 7 21:55:33 2018 -0500 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]> --- drivers/net/ethernet/ibm/ibmvnic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index afaf29b201dc..8dc8fc503750 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1831,7 +1831,8 @@ restart_poll: 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; -- To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html