ibmvnic: Check adapter state during ibmvnic_poll

We do not want to process any receive frames if the ibmvnic_poll
routine is invoked while a reset is in process. Also, before
replenishing the rx pools in the ibmvnic_poll, we want to
make sure the adapter is not in the process of closing.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 47421e4052c3..760352f7f98d 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1435,6 +1435,10 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
         struct ibmvnic_adapter *adapter = netdev_priv(netdev);
         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;
@@ -1493,7 +1497,9 @@ restart_poll:
                 netdev->stats.rx_bytes += length;
                 frames_processed++;
         }
-        replenish_rx_pool(adapter, &adapter->rx_pool[scrq_num]);
+
+        if (adapter->state != VNIC_CLOSING)
+                replenish_rx_pool(adapter, &adapter->rx_pool[scrq_num]);
 
         if (frames_processed < budget) {
                 enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);