be2net: avoid napi_disable() when it has not been enabled

When RQ creation fails in be_open(), driver jumps to be_close() where
napi_disable() is done without a prior napi_enable(); leading to a hang.
This change is needed as there is no way to see if napi is enable/disabled.

Signed-off-by: Kalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 234ce6f07544822152075bd4401492237647a9cd..f544b297c9abef7b7ee73fa3a5fd4eb2b9921f42 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -327,6 +327,7 @@ enum vf_state {
 
 #define BE_FLAGS_LINK_STATUS_INIT              1
 #define BE_FLAGS_WORKER_SCHEDULED              (1 << 3)
+#define BE_FLAGS_NAPI_ENABLED                  (1 << 9)
 #define BE_UC_PMAC_COUNT               30
 #define BE_VF_UC_PMAC_COUNT            2
 #define BE_FLAGS_QNQ_ASYNC_EVT_RCVD            (1 << 11)

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 591a8675a13dc201a1cb3a86585bdf1855ff4fce..e6b5c4cd8c0c53eaf67a8bf0817b7f30ec232396 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2548,8 +2548,11 @@ static int be_close(struct net_device *netdev)
 
        be_roce_dev_close(adapter);
 
-       for_all_evt_queues(adapter, eqo, i)
-               napi_disable(&eqo->napi);
+       if (adapter->flags & BE_FLAGS_NAPI_ENABLED) {
+               for_all_evt_queues(adapter, eqo, i)
+                       napi_disable(&eqo->napi);
+               adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
+       }
 
        be_async_mcc_disable(adapter);
 
@@ -2657,6 +2660,7 @@ static int be_open(struct net_device *netdev)
                napi_enable(&eqo->napi);
                be_eq_notify(adapter, eqo->q.id, true, false, 0);
        }
+       adapter->flags |= BE_FLAGS_NAPI_ENABLED;
 
        status = be_cmd_link_status_query(adapter, NULL, &link_status, 0);
        if (!status)