From 3480f96cd80993a1325fc82594fd3ab1ff4305e0 Mon Sep 17 00:00:00 2001 From: Rakesh Sunki Date: Mon, 29 Aug 2016 17:29:53 -0700 Subject: [PATCH] qcacld-3.0: Fix to call NDP session end handler only if the mode is NDI NDP session end handler is being invoked, whenever a session is being ended irrespective of the mode of the session. Add a check to call the ndp session end handler only if the adapter mode is NDI. Change-Id: Iade4de486ede375239a66517fd47d1eb4501b517 CRs-Fixed: 1060808 --- core/hdd/src/wlan_hdd_main.c | 3 ++- core/hdd/src/wlan_hdd_nan_datapath.c | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index db8d25fc9206..8bbe09acc521 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2498,7 +2498,8 @@ QDF_STATUS hdd_sme_close_session_callback(void *pContext) * For NAN Data interface, the close session results in the final * indication to the userspace */ - hdd_ndp_session_end_handler(adapter); + if (adapter->device_mode == QDF_NDI_MODE) + hdd_ndp_session_end_handler(adapter); clear_bit(SME_SESSION_OPENED, &adapter->event_flags); diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index 5a08f404efcb..9e639de41079 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -900,12 +900,6 @@ void hdd_ndp_session_end_handler(hdd_adapter_t *adapter) if (wlan_hdd_validate_context(hdd_ctx)) return; - /* Handle only if adapter is in NDI mode */ - if (QDF_NDI_MODE != adapter->device_mode) { - hdd_err("Adapter is not in NDI mode"); - return; - } - ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter); if (!ndp_ctx) { hdd_err("ndp context is NULL");