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
This commit is contained in:
Wu Gao 2017-03-22 12:54:13 +08:00
commit 89c8a8a546
2 changed files with 6 additions and 6 deletions

View file

@ -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

View file

@ -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