From: David S. Miller <davem@davemloft.net>
Date: Thu, 28 Nov 2013 23:53:36 +0000 (-0500)
Subject: Revert "be2net: call napi_disable() for all event queues"
X-Git-Tag: firefly_0821_release~176^2~4845^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=71237b6feb8361a00a1cb481a0c901fbee8f82a5;p=firefly-linux-kernel-4.4.55.git

Revert "be2net: call napi_disable() for all event queues"

This reverts commit 55485e7b417b640870b14eceec4cfbcb2b3e7a92.

I applied the wrong version of this patch, the right one is coming up
next.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 0aec4d23eb58..78a0e859760b 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2663,8 +2663,8 @@ static int be_close(struct net_device *netdev)
 			napi_disable(&eqo->napi);
 			be_disable_busy_poll(eqo);
 		}
+		adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
 	}
-	adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
 
 	be_async_mcc_disable(adapter);