[PATCH 5/5 net-next] ibmvnic: Exit polling routine correctly during adapter reset

[Thomas Falcon]

This patch fixes a bug where, in the case of a device reset,
the polling routine will never complete, causing napi_disable
to sleep indefinitely when attempting to close the device. 

Signed-off-by: Thomas Falcon <tlfal...@linux.vnet.ibm.com>
---
 drivers/net/ethernet/ibm/ibmvnic.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c 
b/drivers/net/ethernet/ibm/ibmvnic.c
index 5378b21..ba4c79d 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1504,9 +1504,6 @@ static int ibmvnic_poll(struct napi_struct *napi, int 
budget)
        int scrq_num = (int)(napi - adapter->napi);
        int frames_processed = 0;
 
-       if (adapter->resetting)
-               return 0;
-
 restart_poll:
        while (frames_processed < budget) {
                struct sk_buff *skb;
@@ -1516,6 +1513,12 @@ static int ibmvnic_poll(struct napi_struct *napi, int 
budget)
                u16 offset;
                u8 flags = 0;
 
+               if (unlikely(adapter->resetting)) {
+                       enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
+                       napi_complete_done(napi, frames_processed);
+                       return frames_processed;
+               }
+
                if (!pending_scrq(adapter, adapter->rx_scrq[scrq_num]))
                        break;
                next = ibmvnic_next_scrq(adapter, adapter->rx_scrq[scrq_num]);
-- 
1.8.5.6