summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/wma/inc/wma.h1
-rw-r--r--core/wma/inc/wma_internal.h7
-rw-r--r--core/wma/src/wlan_qct_wma_legacy.c2
-rw-r--r--core/wma/src/wma_data.c4
-rw-r--r--core/wma/src/wma_dev_if.c8
-rw-r--r--core/wma/src/wma_dfs_interface.c1
-rw-r--r--core/wma/src/wma_features.c33
-rw-r--r--core/wma/src/wma_main.c38
-rw-r--r--core/wma/src/wma_mgmt.c8
-rw-r--r--core/wma/src/wma_nan_datapath.c13
-rw-r--r--core/wma/src/wma_power.c6
-rw-r--r--core/wma/src/wma_scan_roam.c17
-rw-r--r--core/wma/src/wma_utils.c15
13 files changed, 71 insertions, 82 deletions
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index ee582700448b..5bc20c0f10f5 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -2196,7 +2196,6 @@ void ieee80211_mark_dfs(struct ieee80211com *ic,
struct dfs_ieee80211_channel *ichan);
int wma_dfs_indicate_radar(struct ieee80211com *ic,
struct dfs_ieee80211_channel *ichan);
-uint16_t dfs_usenol(struct ieee80211com *ic);
QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id,
tp_wma_trigger_uapsd_params
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index a35254ae321b..a5a6aae39297 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -1169,13 +1169,6 @@ struct dfs_ieee80211_channel *wma_dfs_configure_channel(
*req);
void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id);
-#ifdef REMOVE_PKT_LOG
-static inline void wma_set_wifi_start_packet_stats(void *wma_handle,
- struct sir_wifi_start_log *start_log)
-{
- return;
-}
-#endif
int wma_rssi_breached_event_handler(void *handle,
u_int8_t *cmd_param_info, u_int32_t len);
#ifdef WLAN_FEATURE_MEMDUMP
diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c
index c2c81bd25977..d675b9116f56 100644
--- a/core/wma/src/wlan_qct_wma_legacy.c
+++ b/core/wma/src/wlan_qct_wma_legacy.c
@@ -71,7 +71,7 @@ tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
* Return: Success or Failure
*/
-tSirRetStatus wma_post_cfg_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
+static tSirRetStatus wma_post_cfg_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
{
tSirRetStatus rc = eSIR_SUCCESS;
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index 84674c38f268..b15cca34e920 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -77,7 +77,7 @@
#include <cdp_txrx_peer_ops.h>
#include <cdp_txrx_cfg.h>
#include "cdp_txrx_stats.h"
-
+#include "ol_ctrl_txrx_api.h"
typedef struct {
int32_t rate;
@@ -1996,7 +1996,7 @@ QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle,
*
* Return: thermal (throttle) level
*/
-uint8_t wma_thermal_mgmt_get_level(void *handle, uint32_t temp)
+static uint8_t wma_thermal_mgmt_get_level(void *handle, uint32_t temp)
{
tp_wma_handle wma = (tp_wma_handle) handle;
int i;
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 55e33bb22839..fbb7aa9e2b0e 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -190,7 +190,7 @@ void *wma_find_vdev_by_bssid(tp_wma_handle wma, uint8_t *bssid,
*
* Return: return operating mode as enum wlan_op_mode type
*/
-enum wlan_op_mode wma_get_txrx_vdev_type(uint32_t type)
+static enum wlan_op_mode wma_get_txrx_vdev_type(uint32_t type)
{
enum wlan_op_mode vdev_type = wlan_op_mode_unknown;
switch (type) {
@@ -407,7 +407,7 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma,
*
* Return: none
*/
-void wma_vdev_detach_callback(void *ctx)
+static void wma_vdev_detach_callback(void *ctx)
{
tp_wma_handle wma;
struct wma_txrx_node *iface = (struct wma_txrx_node *)ctx;
@@ -1283,8 +1283,8 @@ static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id)
*
* Return: none
*/
-void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle,
- uint8_t sessionId)
+static void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle,
+ uint8_t sessionId)
{
struct wma_txrx_node *intr = wma_handle->interfaces;
struct hidden_ssid_vdev_restart_params params;
diff --git a/core/wma/src/wma_dfs_interface.c b/core/wma/src/wma_dfs_interface.c
index be1022d21c8c..4af86ba6e233 100644
--- a/core/wma/src/wma_dfs_interface.c
+++ b/core/wma/src/wma_dfs_interface.c
@@ -34,6 +34,7 @@
#include "wma.h"
#include "ath_dfs_structs.h"
#include "wma_dfs_interface.h"
+#include "dfs_interface.h"
#ifndef ATH_SUPPORT_DFS
#define ATH_SUPPORT_DFS 1
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index a2cef423385b..80c4ab3015b6 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -523,8 +523,9 @@ error:
*
* Return: QDF status
*/
-QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle,
- tSirLPHBReq *lphb_conf_req, bool by_user)
+static QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle,
+ tSirLPHBReq *lphb_conf_req,
+ bool by_user)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
int status = 0;
@@ -598,8 +599,8 @@ error:
*
* Return: QDF status
*/
-QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle,
- tSirLPHBReq *lphb_conf_req)
+static QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle,
+ tSirLPHBReq *lphb_conf_req)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
int status = 0;
@@ -655,8 +656,8 @@ error:
*
* Return: QDF status
*/
-QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle,
- tSirLPHBReq *lphb_conf_req)
+static QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle,
+ tSirLPHBReq *lphb_conf_req)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
int status = 0;
@@ -705,8 +706,8 @@ error:
*
* Return: QDF status
*/
-QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle,
- tSirLPHBReq *lphb_conf_req)
+static QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle,
+ tSirLPHBReq *lphb_conf_req)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
int status = 0;
@@ -761,8 +762,8 @@ error:
*
* Return: QDF status
*/
-QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle,
- tSirLPHBReq *lphb_conf_req)
+static QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle,
+ tSirLPHBReq *lphb_conf_req)
{
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
int status = 0;
@@ -2675,7 +2676,7 @@ static bool tlv_check_required(int32_t reason)
*
* Return: string for proto subtype for data packet
*/
-const char *
+static const char *
wma_pkt_proto_subtype_to_string(enum qdf_proto_subtype proto_subtype)
{
switch (proto_subtype) {
@@ -4433,7 +4434,7 @@ bool static wma_is_nan_enabled(tp_wma_handle wma)
*
* Return: true if wma needs to configure wow false otherwise.
*/
-bool wma_is_wow_applicable(tp_wma_handle wma)
+static bool wma_is_wow_applicable(tp_wma_handle wma)
{
int vdev_id;
if (wma_support_wow_for_beaconing(wma)) {
@@ -4479,7 +4480,7 @@ bool wma_is_wow_applicable(tp_wma_handle wma)
*
* Return: none
*/
-void wma_configure_dynamic_wake_events(tp_wma_handle wma)
+static void wma_configure_dynamic_wake_events(tp_wma_handle wma)
{
int vdev_id;
int enable_mask;
@@ -6491,7 +6492,7 @@ int wma_bus_suspend(void)
*
* Return: os error code.
*/
-int __wma_bus_resume(WMA_HANDLE handle)
+static int __wma_bus_resume(WMA_HANDLE handle)
{
bool wow_mode = wma_is_wow_mode_selected(handle);
tp_wma_handle wma = handle;
@@ -7417,8 +7418,8 @@ void wma_set_dfs_region(tp_wma_handle wma, enum dfs_region dfs_region)
*
* Return: return number of channels
*/
-int wma_get_channels(struct dfs_ieee80211_channel *ichan,
- struct wma_dfs_radar_channel_list *chan_list)
+static int wma_get_channels(struct dfs_ieee80211_channel *ichan,
+ struct wma_dfs_radar_channel_list *chan_list)
{
uint8_t center_chan = cds_freq_to_chan(ichan->ic_vhtop_ch_freq_seg1);
int count = 0;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index b8b06998477d..06c2ba198a1b 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -766,8 +766,8 @@ static int32_t wma_set_priv_cfg(tp_wma_handle wma_handle,
*
* Return: none
*/
-void wma_set_dtim_period(tp_wma_handle wma,
- struct set_dtim_params *dtim_params)
+static void wma_set_dtim_period(tp_wma_handle wma,
+ struct set_dtim_params *dtim_params)
{
QDF_STATUS ret;
uint8_t vdev_id = dtim_params->session_id;
@@ -4333,7 +4333,7 @@ static int wma_setup_wmi_init_msg(tp_wma_handle wma_handle,
*
* Return: None
*/
-void wma_dump_dbs_hw_mode(tp_wma_handle wma_handle)
+static void wma_dump_dbs_hw_mode(tp_wma_handle wma_handle)
{
uint32_t i, param;
@@ -4371,9 +4371,9 @@ void wma_dump_dbs_hw_mode(tp_wma_handle wma_handle)
*
* Return: None
*/
-void wma_init_scan_fw_mode_config(tp_wma_handle wma_handle,
- uint32_t scan_config,
- uint32_t fw_config)
+static void wma_init_scan_fw_mode_config(tp_wma_handle wma_handle,
+ uint32_t scan_config,
+ uint32_t fw_config)
{
tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE);
@@ -5004,7 +5004,7 @@ static void wma_print_populate_soc_caps(t_wma_handle *wma_handle)
*
* Return: BW in terms of hw_mode_bandwidth.
*/
-enum hw_mode_bandwidth wma_map_wmi_channel_width_to_hw_mode_bw(
+static enum hw_mode_bandwidth wma_map_wmi_channel_width_to_hw_mode_bw(
wmi_channel_width width)
{
switch (width) {
@@ -5654,8 +5654,8 @@ pkt_pwr_save_config:
*
* Return: QDF_SUCCESS for success otherwise failure
*/
-QDF_STATUS wma_process_set_mas(tp_wma_handle wma,
- uint32_t *mas_val)
+static QDF_STATUS wma_process_set_mas(tp_wma_handle wma,
+ uint32_t *mas_val)
{
uint32_t val;
@@ -5687,7 +5687,8 @@ QDF_STATUS wma_process_set_mas(tp_wma_handle wma,
* Return: QDF_SUCCESS for success otherwise failure
*
*/
-QDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val)
+static QDF_STATUS wma_process_set_miracast(tp_wma_handle wma,
+ uint32_t *miracast_val)
{
if (NULL == wma || NULL == miracast_val) {
WMA_LOGE("%s: Invalid input to store miracast value", __func__);
@@ -5780,8 +5781,8 @@ static QDF_STATUS wma_config_guard_time(tp_wma_handle wma,
*
* Return: None
*/
-void wma_enable_specific_fw_logs(tp_wma_handle wma_handle,
- struct sir_wifi_start_log *start_log)
+static void wma_enable_specific_fw_logs(tp_wma_handle wma_handle,
+ struct sir_wifi_start_log *start_log)
{
if (!start_log) {
@@ -5806,8 +5807,6 @@ void wma_enable_specific_fw_logs(tp_wma_handle wma_handle,
return;
}
-#if !defined(REMOVE_PKT_LOG)
-
#define MEGABYTE (1024 * 1024)
/**
* wma_set_wifi_start_packet_stats() - Start/stop packet stats
@@ -5820,8 +5819,15 @@ void wma_enable_specific_fw_logs(tp_wma_handle wma_handle,
* Return: None
*
*/
-void wma_set_wifi_start_packet_stats(void *wma_handle,
- struct sir_wifi_start_log *start_log)
+#ifdef REMOVE_PKT_LOG
+static void wma_set_wifi_start_packet_stats(void *wma_handle,
+ struct sir_wifi_start_log *start_log)
+{
+ return;
+}
+#else
+static void wma_set_wifi_start_packet_stats(void *wma_handle,
+ struct sir_wifi_start_log *start_log)
{
struct hif_opaque_softc *scn;
uint32_t log_state;
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index d5aef6cedc37..1668b4b53bb6 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -2139,8 +2139,8 @@ static QDF_STATUS wma_unified_bcn_tmpl_send(tp_wma_handle wma,
*
* Return: QDF status
*/
-QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id,
- tpSendbeaconParams bcn_info)
+static QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id,
+ tpSendbeaconParams bcn_info)
{
struct beacon_info *bcn;
uint32_t len;
@@ -2472,8 +2472,8 @@ void wma_beacon_miss_handler(tp_wma_handle wma, uint32_t vdev_id)
*
* Return: 0 for success or error code
*/
-int wma_process_mgmt_tx_completion(tp_wma_handle wma_handle,
- uint32_t desc_id, uint32_t status)
+static int wma_process_mgmt_tx_completion(tp_wma_handle wma_handle,
+ uint32_t desc_id, uint32_t status)
{
struct wmi_desc_t *wmi_desc;
ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c
index 34a1b7affde8..b5ab05a9c031 100644
--- a/core/wma/src/wma_nan_datapath.c
+++ b/core/wma/src/wma_nan_datapath.c
@@ -362,19 +362,6 @@ send_ndp_end_fail:
}
/**
- * wma_handle_ndp_sched_update_req() - NDP schedule update request handler
- * @wma_handle: wma handle
- * @req_params: request parameters
- *
- * Return: QDF_STATUS_SUCCESS on success; error number otherwise
- */
-QDF_STATUS wma_handle_ndp_sched_update_req(tp_wma_handle wma_handle,
- struct ndp_end_req *req_params)
-{
- return QDF_STATUS_SUCCESS;
-}
-
-/**
* wma_ndp_indication_event_handler() - NDP indication event handler
* @handle: wma handle
* @event_info: event handler data
diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c
index e5194ae626a7..0154f7bb9901 100644
--- a/core/wma/src/wma_power.c
+++ b/core/wma/src/wma_power.c
@@ -489,8 +489,8 @@ end:
*
* Return: QDF_STATUS_SUCCESS for success or error code
*/
-QDF_STATUS wmi_unified_set_sta_ps(wmi_unified_t wmi_handle,
- uint32_t vdev_id, uint8_t val)
+static QDF_STATUS wmi_unified_set_sta_ps(wmi_unified_t wmi_handle,
+ uint32_t vdev_id, uint8_t val)
{
QDF_STATUS ret;
@@ -1248,7 +1248,7 @@ QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle,
*
* Return: ptr after p2p ie
*/
-uint8_t *wma_add_p2p_ie(uint8_t *frm)
+static uint8_t *wma_add_p2p_ie(uint8_t *frm)
{
uint8_t wfa_oui[3] = WMA_P2P_WFA_OUI;
struct p2p_ie *p2p_ie = (struct p2p_ie *)frm;
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index 8d28d4806bca..e45f84320bb2 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -1547,8 +1547,8 @@ QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle,
* Return: Return success upon succesfully passing the
* parameters to the firmware, otherwise failure.
*/
-QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle,
- tSirRoamOffloadScanReq *roam_req)
+static QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle,
+ tSirRoamOffloadScanReq *roam_req)
{
int i;
QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -2089,9 +2089,9 @@ void wma_process_roam_synch_fail(WMA_HANDLE handle,
*
* Return: None
*/
-void wma_fill_roam_synch_buffer(tp_wma_handle wma,
- roam_offload_synch_ind *roam_synch_ind_ptr,
- WMI_ROAM_SYNCH_EVENTID_param_tlvs *param_buf)
+static void wma_fill_roam_synch_buffer(tp_wma_handle wma,
+ roam_offload_synch_ind *roam_synch_ind_ptr,
+ WMI_ROAM_SYNCH_EVENTID_param_tlvs *param_buf)
{
wmi_roam_synch_event_fixed_param *synch_event;
uint8_t *bcn_probersp_ptr;
@@ -2181,8 +2181,8 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma,
*
* Return: None
*/
-void wma_roam_update_vdev(tp_wma_handle wma,
- roam_offload_synch_ind *roam_synch_ind_ptr)
+static void wma_roam_update_vdev(tp_wma_handle wma,
+ roam_offload_synch_ind *roam_synch_ind_ptr)
{
tDeleteBssParams *del_bss_params;
tDeleteStaParams *del_sta_params;
@@ -2701,7 +2701,8 @@ void wma_process_roam_synch_complete(WMA_HANDLE handle, uint8_t vdev_id)
*
* Return: 0 for success, otherwise appropriate error code
*/
-QDF_STATUS wma_switch_channel(tp_wma_handle wma, struct wma_vdev_start_req *req)
+static QDF_STATUS wma_switch_channel(tp_wma_handle wma,
+ struct wma_vdev_start_req *req)
{
wmi_buf_t buf;
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index 6c87a5a19e2f..679b1732c11b 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -1839,7 +1839,7 @@ int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle,
#endif
#ifdef HELIUMPLUS
-bool wma_is_valid_fw_stats_cmd(uint32_t value)
+static bool wma_is_valid_fw_stats_cmd(uint32_t value)
{
if (value > (HTT_DBG_NUM_STATS + 1) ||
value == (HTT_DBG_STATS_RX_RATE_INFO + 1) ||
@@ -1851,7 +1851,7 @@ bool wma_is_valid_fw_stats_cmd(uint32_t value)
return true;
}
#else
-bool wma_is_valid_fw_stats_cmd(uint32_t value)
+static bool wma_is_valid_fw_stats_cmd(uint32_t value)
{
if (value > (HTT_DBG_NUM_STATS + 1) ||
value == (HTT_DBG_STATS_RX_RATE_INFO_V2 + 1) ||
@@ -2158,7 +2158,8 @@ bool wma_is_vdev_up(uint8_t vdev_id)
*
* Return: 0 for success or error code
*/
-int wma_utf_rsp(tp_wma_handle wma_handle, uint8_t **payload, uint32_t *len)
+static int wma_utf_rsp(tp_wma_handle wma_handle, uint8_t **payload,
+ uint32_t *len)
{
int ret = -1;
uint32_t payload_len;
@@ -2333,7 +2334,8 @@ void wma_utf_attach(tp_wma_handle wma_handle)
*
* Return: QDF_STATUS_SUCCESS for success or error code
*/
-QDF_STATUS wma_utf_cmd(tp_wma_handle wma_handle, uint8_t *data, uint16_t len)
+static QDF_STATUS wma_utf_cmd(tp_wma_handle wma_handle, uint8_t *data,
+ uint16_t len)
{
struct pdev_utf_params param = {0};
@@ -2420,9 +2422,8 @@ QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx,
*
* Return: None
*/
-void wma_get_tx_rx_ss_from_config(enum hw_mode_ss_config mac_ss,
- uint32_t *tx_ss,
- uint32_t *rx_ss)
+static void wma_get_tx_rx_ss_from_config(enum hw_mode_ss_config mac_ss,
+ uint32_t *tx_ss, uint32_t *rx_ss)
{
switch (mac_ss) {
case HW_MODE_SS_0x0: