From 89c8a8a54641334854d109230f50ef4ea9bc4c13 Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Wed, 22 Mar 2017 12:54:13 +0800 Subject: [PATCH] qcacmn: Change WLAN_P2P_ENABLE to CONVERGED_P2P_ENABLE Change it since WLAN_P2P_ENABLE easily confused with existed macro WLAN_FEATURE_P2P Change-Id: Ia27aae849da7a8f8921bff40168105ca16b993b7 CRs-Fixed: 2021996 --- target_if/core/src/target_if_main.c | 4 ++-- .../global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target_if/core/src/target_if_main.c b/target_if/core/src/target_if_main.c index a8687791ca52..db4c28d77a5d 100644 --- a/target_if/core/src/target_if_main.c +++ b/target_if/core/src/target_if_main.c @@ -29,7 +29,7 @@ #include "target_if_atf.h" #endif -#ifdef WLAN_P2P_ENABLE +#ifdef CONVERGED_P2P_ENABLE #include "target_if_p2p.h" #endif @@ -145,7 +145,7 @@ QDF_STATUS target_if_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops) /* Components parallel to UMAC to register their TX-ops here */ target_if_pmo_register_tx_ops_req(tx_ops); -#ifdef WLAN_P2P_ENABLE +#ifdef CONVERGED_P2P_ENABLE /* Converged UMAC components to register P2P TX-ops */ target_if_p2p_register_tx_ops(tx_ops); #endif diff --git a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h index e2d4a3368909..0d5dd84e2a36 100644 --- a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h +++ b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h @@ -202,7 +202,7 @@ struct wlan_lmac_if_pmo_tx_ops { }; #endif -#ifdef WLAN_P2P_ENABLE +#ifdef CONVERGED_P2P_ENABLE /* forward declarations for p2p tx ops */ struct p2p_ps_config; @@ -333,7 +333,7 @@ struct wlan_lmac_if_tx_ops { #ifdef WLAN_PMO_ENABLE struct wlan_lmac_if_pmo_tx_ops pmo_tx_ops; #endif -#ifdef WLAN_P2P_ENABLE +#ifdef CONVERGED_P2P_ENABLE struct wlan_lmac_if_p2p_tx_ops p2p; #endif #ifdef WLAN_ATF_ENABLE @@ -391,7 +391,7 @@ struct wlan_lmac_if_pmo_rx_ops { }; #endif -#ifdef WLAN_P2P_ENABLE +#ifdef CONVERGED_P2P_ENABLE /* forward declarations for p2p rx ops */ struct p2p_noa_info; @@ -525,7 +525,7 @@ struct wlan_lmac_if_rx_ops { #ifdef WLAN_PMO_ENABLE struct wlan_lmac_if_pmo_rx_ops pmo_rx_ops; #endif -#ifdef WLAN_P2P_ENABLE +#ifdef CONVERGED_P2P_ENABLE struct wlan_lmac_if_p2p_rx_ops p2p; #endif #ifdef WLAN_ATF_ENABLE