qcacmn: pmo feature flag disable

In case PMO feature flag disable, add this change. Change
WLAN_PMO_ENABLE  to WLAN_POWER_MANAGEMENT_OFFLOAD.

Change-Id: I875e568dcb239da1b86d1a76cb8cbc925bb13cde
CRs-Fixed: 2243948
This commit is contained in:
Wu Gao
2018-05-17 16:14:00 +08:00
committed by nshrivas
parent 1883008d4c
commit dd58f63b13
7 changed files with 17 additions and 14 deletions

View File

@@ -34,7 +34,7 @@
#include "wlan_p2p_roc.h"
#include "wlan_p2p_off_chan_tx.h"
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
#include <wlan_pmo_obj_mgmt_api.h>
#endif
@@ -537,7 +537,7 @@ static void wlan_p2p_init_connection_status(
}
#endif /* WLAN_FEATURE_P2P_DEBUG */
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
/**
* p2p_suspend_handler() - suspend handler of P2P
@@ -655,12 +655,14 @@ static inline QDF_STATUS p2p_unregister_pmo_handler(void)
#else
static inline QDF_STATUS p2p_register_pmo_handler(void)
{
return QDF_STATUS_SUCCESS;
}
static inline QDF_STATUS p2p_unregister_pmo_handler(void)
{
return QDF_STATUS_SUCCESS;
}
#endif /* End of WLAN_PMO_ENABLE */
#endif /* End of WLAN_POWER_MANAGEMENT_OFFLOAD */
QDF_STATUS p2p_component_init(void)
{

View File

@@ -23,6 +23,7 @@
#include <wmi_unified_api.h>
#include <wlan_mgmt_txrx_utils_api.h>
#include <wlan_objmgr_psoc_obj.h>
#include <wlan_objmgr_peer_obj.h>
#include <wlan_utility.h>
#include "wlan_p2p_public_struct.h"
#include "wlan_p2p_tgt_api.h"

View File

@@ -22,6 +22,7 @@
#include <wmi_unified_api.h>
#include <wlan_objmgr_psoc_obj.h>
#include <wlan_objmgr_vdev_obj.h>
#include <scheduler_api.h>
#include "wlan_p2p_public_struct.h"
#include "wlan_p2p_ucfg_api.h"

View File

@@ -33,7 +33,7 @@
#include "../../core/src/wlan_scan_main.h"
#include "../../core/src/wlan_scan_manager.h"
#include "../../core/src/wlan_scan_cache_db.h"
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
#include <wlan_pmo_obj_mgmt_api.h>
#endif
#ifdef WLAN_POLICY_MGR_ENABLE
@@ -1889,6 +1889,7 @@ QDF_STATUS ucfg_scan_update_roam_params(struct wlan_objmgr_psoc *psoc,
return QDF_STATUS_SUCCESS;
}
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
static QDF_STATUS
ucfg_scan_cancel_pdev_scan(struct wlan_objmgr_pdev *pdev)
{
@@ -1920,8 +1921,6 @@ ucfg_scan_cancel_pdev_scan(struct wlan_objmgr_pdev *pdev)
return status;
}
#ifdef WLAN_PMO_ENABLE
static QDF_STATUS
ucfg_scan_suspend_handler(struct wlan_objmgr_psoc *psoc, void *arg)
{

View File

@@ -33,7 +33,7 @@
#include "service_ready_param.h"
#include "wlan_objmgr_psoc_obj.h"
#include "wlan_mgmt_txrx_utils_api.h"
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
#include "wmi_unified_pmo_api.h"
#endif
#ifdef CONVERGED_P2P_ENABLE

View File

@@ -540,7 +540,7 @@ QDF_STATUS (*send_snr_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
QDF_STATUS (*send_link_status_req_cmd)(wmi_unified_t wmi_handle,
struct link_status_params *link_status);
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
QDF_STATUS (*send_add_wow_wakeup_event_cmd)(wmi_unified_t wmi_handle,
uint32_t vdev_id,
uint32_t *bitmap,
@@ -615,7 +615,7 @@ QDF_STATUS (*send_enable_disable_packet_filter_cmd)(wmi_unified_t wmi_handle,
QDF_STATUS (*send_config_packet_filter_cmd)(wmi_unified_t wmi_handle,
uint8_t vdev_id, struct pmo_rcv_pkt_fltr_cfg *rcv_filter_param,
uint8_t filter_id, bool enable);
#endif /* end of WLAN_PMO_ENABLE */
#endif /* end of WLAN_POWER_MANAGEMENT_OFFLOAD */
#ifdef CONFIG_MCL
QDF_STATUS (*send_process_dhcp_ind_cmd)(wmi_unified_t wmi_handle,
wmi_peer_set_param_cmd_fixed_param *ta_dhcp_ind);

View File

@@ -28,7 +28,7 @@
#ifdef CONVERGED_P2P_ENABLE
#include "wlan_p2p_public_struct.h"
#endif
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
#include "wlan_pmo_hw_filter_public_struct.h"
#endif
#include <wlan_utility.h>
@@ -13303,7 +13303,7 @@ send_pdev_fips_cmd_tlv(wmi_unified_t wmi_handle,
return retval;
}
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
/**
* send_add_wow_wakeup_event_cmd_tlv() - Configures wow wakeup events.
* @wmi_handle: wmi handle
@@ -14685,7 +14685,7 @@ static QDF_STATUS send_config_packet_filter_cmd_tlv(wmi_unified_t wmi_handle,
return QDF_STATUS_SUCCESS;
}
#endif /* End of WLAN_PMO_ENABLE */
#endif /* End of WLAN_POWER_MANAGEMENT_OFFLOAD */
/**
* send_set_ssid_hotlist_cmd_tlv() - Handle an SSID hotlist set request
@@ -21638,7 +21638,7 @@ struct wmi_ops tlv_ops = {
.send_snr_request_cmd = send_snr_request_cmd_tlv,
.send_snr_cmd = send_snr_cmd_tlv,
.send_link_status_req_cmd = send_link_status_req_cmd_tlv,
#ifdef WLAN_PMO_ENABLE
#ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
.send_add_wow_wakeup_event_cmd = send_add_wow_wakeup_event_cmd_tlv,
.send_wow_patterns_to_fw_cmd = send_wow_patterns_to_fw_cmd_tlv,
.send_enable_arp_ns_offload_cmd = send_enable_arp_ns_offload_cmd_tlv,
@@ -21666,7 +21666,7 @@ struct wmi_ops tlv_ops = {
.send_enable_disable_packet_filter_cmd =
send_enable_disable_packet_filter_cmd_tlv,
.send_config_packet_filter_cmd = send_config_packet_filter_cmd_tlv,
#endif /* End of WLAN_PMO_ENABLE */
#endif /* End of WLAN_POWER_MANAGEMENT_OFFLOAD */
#ifdef CONFIG_MCL
.send_process_dhcp_ind_cmd = send_process_dhcp_ind_cmd_tlv,
.send_get_link_speed_cmd = send_get_link_speed_cmd_tlv,