ibmvnic: Exit polling routine correctly during adapter reset

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 <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index ebe443fe51dbdfabd5d2c25e310aa75eaa5eef13..9923b9fa0c74cfb21b306119bf933c012b828444 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1505,9 +1505,6 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
        int scrq_num = (int)(napi - adapter->napi);
        int frames_processed = 0;
 
        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;
 restart_poll:
        while (frames_processed < budget) {
                struct sk_buff *skb;


@@ -1517,6 +1514,12 @@ restart_poll:
                u16 offset;
                u8 flags = 0;
 
                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]);
                if (!pending_scrq(adapter, adapter->rx_scrq[scrq_num]))
                        break;
                next = ibmvnic_next_scrq(adapter, adapter->rx_scrq[scrq_num]);