diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index 2f8aba2bb1..fd0003a081 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -2019,7 +2019,7 @@ QDF_STATUS wmi_unified_ndp_end_req_cmd_send(void *wmi_hdl,
  * Return: status of operation
  */
 QDF_STATUS wmi_extract_ndp_initiator_rsp(wmi_unified_t wmi_handle,
-			uint8_t *data, struct nan_datapath_initiator_rsp **rsp);
+			uint8_t *data, struct nan_datapath_initiator_rsp *rsp);
 
 /**
  * wmi_extract_ndp_ind - api to extract ndp indication struct from even buffer
@@ -2030,7 +2030,7 @@ QDF_STATUS wmi_extract_ndp_initiator_rsp(wmi_unified_t wmi_handle,
  * Return: status of operation
  */
 QDF_STATUS wmi_extract_ndp_ind(wmi_unified_t wmi_handle, uint8_t *data,
-			struct nan_datapath_indication_event **ind);
+			struct nan_datapath_indication_event *ind);
 
 /**
  * wmi_extract_ndp_confirm - api to extract ndp confim struct from even buffer
@@ -2041,7 +2041,7 @@ QDF_STATUS wmi_extract_ndp_ind(wmi_unified_t wmi_handle, uint8_t *data,
  * Return: status of operation
  */
 QDF_STATUS wmi_extract_ndp_confirm(wmi_unified_t wmi_handle, uint8_t *data,
-			struct nan_datapath_confirm_event **ev);
+			struct nan_datapath_confirm_event *ev);
 
 /**
  * wmi_extract_ndp_responder_rsp - api to extract responder rsp from even buffer
@@ -2052,7 +2052,7 @@ QDF_STATUS wmi_extract_ndp_confirm(wmi_unified_t wmi_handle, uint8_t *data,
  * Return: status of operation
  */
 QDF_STATUS wmi_extract_ndp_responder_rsp(wmi_unified_t wmi_handle,
-			uint8_t *data, struct nan_datapath_responder_rsp **rsp);
+			uint8_t *data, struct nan_datapath_responder_rsp *rsp);
 
 /**
  * wmi_extract_ndp_end_rsp - api to extract ndp end rsp from even buffer
@@ -2063,7 +2063,7 @@ QDF_STATUS wmi_extract_ndp_responder_rsp(wmi_unified_t wmi_handle,
  * Return: status of operation
  */
 QDF_STATUS wmi_extract_ndp_end_rsp(wmi_unified_t wmi_handle, uint8_t *data,
-			struct nan_datapath_end_rsp_event **rsp);
+			struct nan_datapath_end_rsp_event *rsp);
 
 /**
  * wmi_extract_ndp_end_ind - api to extract ndp end indication from even buffer
@@ -2075,7 +2075,6 @@ QDF_STATUS wmi_extract_ndp_end_rsp(wmi_unified_t wmi_handle, uint8_t *data,
  */
 QDF_STATUS wmi_extract_ndp_end_ind(wmi_unified_t wmi_handle, uint8_t *data,
 			struct nan_datapath_end_indication_event **ind);
-
 #endif
 
 /**
@@ -2226,4 +2225,5 @@ QDF_STATUS wmi_unified_offload_11k_cmd(void *wmi_hdl,
  */
 QDF_STATUS wmi_unified_invoke_neighbor_report_cmd(void *wmi_hdl,
 			struct wmi_invoke_neighbor_report_params *params);
+
 #endif /* _WMI_UNIFIED_API_H_ */
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index eda2e28475..53b122a3ae 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -1516,18 +1516,19 @@ QDF_STATUS (*send_ndp_end_req_cmd)(wmi_unified_t wmi_handle,
 				struct nan_datapath_end_req *req);
 
 QDF_STATUS (*extract_ndp_initiator_rsp)(wmi_unified_t wmi_handle,
-		uint8_t *data, struct nan_datapath_initiator_rsp **rsp);
+		uint8_t *data, struct nan_datapath_initiator_rsp *rsp);
 QDF_STATUS (*extract_ndp_ind)(wmi_unified_t wmi_handle,
-		uint8_t *data, struct nan_datapath_indication_event **ind);
+		uint8_t *data, struct nan_datapath_indication_event *ind);
 QDF_STATUS (*extract_ndp_confirm)(wmi_unified_t wmi_handle,
-		uint8_t *data, struct nan_datapath_confirm_event **ev);
+		uint8_t *data, struct nan_datapath_confirm_event *ev);
 QDF_STATUS (*extract_ndp_responder_rsp)(wmi_unified_t wmi_handle,
-		uint8_t *data, struct nan_datapath_responder_rsp **rsp);
+		uint8_t *data, struct nan_datapath_responder_rsp *rsp);
 QDF_STATUS (*extract_ndp_end_rsp)(wmi_unified_t wmi_handle,
-		uint8_t *data, struct nan_datapath_end_rsp_event **rsp);
+		uint8_t *data, struct nan_datapath_end_rsp_event *rsp);
 QDF_STATUS (*extract_ndp_end_ind)(wmi_unified_t wmi_handle,
 		uint8_t *data, struct nan_datapath_end_indication_event **ind);
-#endif
+#endif /* WLAN_FEATURE_NAN_CONVERGENCE */
+
 QDF_STATUS (*send_btm_config)(wmi_unified_t wmi_handle,
 			      struct wmi_btm_config *params);
 QDF_STATUS (*send_obss_detection_cfg_cmd)(wmi_unified_t wmi_handle,