Explorar el Código

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
Rakesh Sunki hace 8 años
padre
commit
3480f96cd8
Se han modificado 2 ficheros con 2 adiciones y 7 borrados
  1. 2 1
      core/hdd/src/wlan_hdd_main.c
  2. 0 6
      core/hdd/src/wlan_hdd_nan_datapath.c

+ 2 - 1
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);
 

+ 0 - 6
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");