diff --git a/wmi_unified_api.c b/wmi_unified_api.c
index a84d30782d..28e5ac0eb6 100644
--- a/wmi_unified_api.c
+++ b/wmi_unified_api.c
@@ -1032,7 +1032,7 @@ QDF_STATUS wmi_unified_set_p2pgo_noa_req_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
-#ifdef CONVERGED_P2P_ENABLE
+#ifdef FEATURE_P2P_LISTEN_OFFLOAD
 /**
  * wmi_unified_p2p_lo_start_cmd() - send p2p lo start request to fw
  * @wmi_hdl: wmi handle
@@ -1073,13 +1073,13 @@ QDF_STATUS wmi_unified_p2p_lo_stop_cmd(void *wmi_hdl, uint8_t vdev_id)
 		return QDF_STATUS_E_INVAL;
 	}
 
-	if (wmi_handle->ops->send_p2p_lo_start_cmd)
+	if (wmi_handle->ops->send_p2p_lo_stop_cmd)
 		return wmi_handle->ops->send_p2p_lo_stop_cmd(wmi_handle,
 				  vdev_id);
 
 	return QDF_STATUS_E_FAILURE;
 }
-#endif /* End of CONVERGED_P2P_ENABLE */
+#endif /* End of FEATURE_P2P_LISTEN_OFFLOAD*/
 
 /**
  * wmi_get_temperature() - get pdev temperature req
@@ -5791,6 +5791,7 @@ QDF_STATUS wmi_extract_swba_noa_info(void *wmi_hdl, void *evt_buf,
 }
 
 #ifdef CONVERGED_P2P_ENABLE
+#ifdef FEATURE_P2P_LISTEN_OFFLOAD
 /**
  * wmi_extract_p2p_lo_stop_ev_param() - extract p2p lo stop param from event
  * @wmi_handle: wmi handle
@@ -5815,6 +5816,7 @@ QDF_STATUS wmi_extract_p2p_lo_stop_ev_param(void *wmi_hdl, void *evt_buf,
 
 	return QDF_STATUS_E_FAILURE;
 }
+#endif
 
 /**
  * wmi_extract_p2p_noa_ev_param() - extract p2p noa param from event
diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c
index 5598b3af8a..18e5bfcd87 100644
--- a/wmi_unified_tlv.c
+++ b/wmi_unified_tlv.c
@@ -3704,7 +3704,7 @@ end:
 	return status;
 }
 
-#ifdef CONVERGED_P2P_ENABLE
+#ifdef FEATURE_P2P_LISTEN_OFFLOAD
 /**
  * send_p2p_lo_start_cmd_tlv() - send p2p lo start request to fw
  * @wmi_handle: wmi handle
@@ -3845,7 +3845,7 @@ static QDF_STATUS send_p2p_lo_stop_cmd_tlv(wmi_unified_t wmi_handle,
 
 	return QDF_STATUS_SUCCESS;
 }
-#endif /* End of CONVERGED_P2P_ENABLE */
+#endif /* End of FEATURE_P2P_LISTEN_OFFLOAD */
 
 /**
  * send_get_temperature_cmd_tlv() - get pdev temperature req
@@ -18549,6 +18549,7 @@ static QDF_STATUS extract_p2p_noa_ev_param_tlv(
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifdef FEATURE_P2P_LISTEN_OFFLOAD
 /**
  * extract_p2p_lo_stop_ev_param_tlv() - extract p2p lo stop
  * information from event
@@ -18585,6 +18586,7 @@ static QDF_STATUS extract_p2p_lo_stop_ev_param_tlv(
 
 	return QDF_STATUS_SUCCESS;
 }
+#endif
 #endif /* End of CONVERGED_P2P_ENABLE */
 
 /**
@@ -21959,7 +21961,7 @@ struct wmi_ops tlv_ops =  {
 	.send_get_temperature_cmd = send_get_temperature_cmd_tlv,
 	.send_set_p2pgo_oppps_req_cmd = send_set_p2pgo_oppps_req_cmd_tlv,
 	.send_set_p2pgo_noa_req_cmd = send_set_p2pgo_noa_req_cmd_tlv,
-#ifdef CONVERGED_P2P_ENABLE
+#ifdef FEATURE_P2P_LISTEN_OFFLOAD
 	.send_p2p_lo_start_cmd = send_p2p_lo_start_cmd_tlv,
 	.send_p2p_lo_stop_cmd = send_p2p_lo_stop_cmd_tlv,
 #endif
@@ -22244,8 +22246,10 @@ struct wmi_ops tlv_ops =  {
 	.extract_swba_noa_info = extract_swba_noa_info_tlv,
 #ifdef CONVERGED_P2P_ENABLE
 	.extract_p2p_noa_ev_param = extract_p2p_noa_ev_param_tlv,
+#ifdef FEATURE_P2P_LISTEN_OFFLOAD
 	.extract_p2p_lo_stop_ev_param =
 				extract_p2p_lo_stop_ev_param_tlv,
+#endif
 #endif
 	.extract_offchan_data_tx_compl_param =
 				extract_offchan_data_tx_compl_param_tlv,