1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 68b9d17a0f1a..a7fd833fe7d2 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2088,6 +2088,18 @@ static int be_close(struct net_device *netdev)
         if (!lancer_chip(adapter))
                 be_intr_set(adapter, false);
 
+        for_all_rx_queues(adapter, rxo, i)
+                napi_disable(&rxo->rx_eq.napi);
+
+        napi_disable(&tx_eq->napi);
+
+        if (lancer_chip(adapter)) {
+                be_cq_notify(adapter, adapter->tx_obj.cq.id, false, 0);
+                be_cq_notify(adapter, adapter->mcc_obj.cq.id, false, 0);
+                for_all_rx_queues(adapter, rxo, i)
+                         be_cq_notify(adapter, rxo->cq.id, false, 0);
+        }
+
         if (adapter->msix_enabled) {
                 vec = be_msix_vec_get(adapter, tx_eq);
                 synchronize_irq(vec);
@@ -2101,11 +2113,6 @@ static int be_close(struct net_device *netdev)
         }
         be_irq_unregister(adapter);
 
-        for_all_rx_queues(adapter, rxo, i)
-                napi_disable(&rxo->rx_eq.napi);
-
-        napi_disable(&tx_eq->napi);
-
         /* Wait for all pending tx completions to arrive so that
          * all tx skbs are freed.
          */