samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Code cleanup for connection manager MLME/SME

Browse Source 
Remove unused code related to ndef FEATURE_CM_ENABLE in MLME/SME.

Change-Id: I022823296d2e186450a1a1082a975eccf0b7c122
CRs-Fixed: 2977907
This commit is contained in:
Abhishek Singh
2021-05-27 19:43:50 +05:30
committed by Madan Koyyalamudi
parent d9fb3d334d
commit 5ca9e12a4e
27 changed files with 19 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c
View File

@@ -40,7 +40,6 @@
#include "cds_utils.h"
#include "wlan_roam_debug.h"
#include "wlan_mlme_twt_api.h"
#ifdef FEATURE_CM_ENABLE
#include "connection_mgr/core/src/wlan_cm_roam.h"
#include "connection_mgr/core/src/wlan_cm_main.h"
#include "connection_mgr/core/src/wlan_cm_sm.h"
@@ -1111,5 +1110,3 @@ rel_ref:
return status;
}
#endif /* WLAN_FEATURE_FIPS */
#endif // FEATURE_CM_ENABLE

3
components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_i.h
View File

@@ -31,7 +31,7 @@
#include "wlan_objmgr_vdev_obj.h"
#include "connection_mgr/core/src/wlan_cm_main.h"
#include "wlan_cm_roam_public_struct.h"
#ifdef FEATURE_CM_ENABLE
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
/**
* cm_add_fw_roam_dummy_ser_cb() - Add dummy blocking command
@@ -194,5 +194,4 @@ QDF_STATUS cm_fw_roam_invoke_fail(struct wlan_objmgr_psoc *psoc,
return QDF_STATUS_E_NOSUPPORT;
}
#endif /*WLAN_FEATURE_ROAM_OFFLOAD */
#endif /* FEATURE_CM_ENABLE */
#endif /* _WLAN_CM_ROAM_I_H_ */

73
components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c
View File

@@ -37,11 +37,9 @@
#include "wlan_cm_vdev_api.h"
#include "cfg_nan_api.h"
#include "wlan_mlme_api.h"
#ifdef FEATURE_CM_ENABLE
#include "connection_mgr/core/src/wlan_cm_roam.h"
#include "connection_mgr/core/src/wlan_cm_main.h"
#include "connection_mgr/core/src/wlan_cm_sm.h"
#endif
#ifdef WLAN_FEATURE_SAE
#define CM_IS_FW_FT_SAE_SUPPORTED(fw_akm_bitmap) \
@@ -2630,13 +2628,6 @@ cm_roam_stop_req(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
if (QDF_IS_STATUS_ERROR(status)) {
mlme_debug("fail to send roam stop");
}
#ifndef FEATURE_CM_ENABLE
else {
status = wlan_cm_roam_scan_offload_rsp(vdev_id, reason);
if (QDF_IS_STATUS_ERROR(status))
mlme_debug("fail to send rso rsp msg");
}
#endif
rel_vdev_ref:
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
@@ -2803,7 +2794,6 @@ cm_akm_roam_allowed(struct wlan_objmgr_psoc *psoc,
}
#endif
#ifdef FEATURE_CM_ENABLE
#ifdef WLAN_ADAPTIVE_11R
static bool
cm_is_adaptive_11r_roam_supported(struct wlan_mlme_psoc_ext_obj *mlme_obj,
@@ -2922,14 +2912,6 @@ static QDF_STATUS cm_is_rso_allowed(struct wlan_objmgr_psoc *psoc,
return status;
}
#else
static QDF_STATUS cm_is_rso_allowed(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id, uint8_t command,
uint8_t reason)
{
return wlan_cm_roam_cmd_allowed(psoc, vdev_id, command, reason);
}
#endif
QDF_STATUS cm_roam_send_rso_cmd(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id, uint8_t rso_command,
@@ -3007,11 +2989,6 @@ cm_roam_switch_to_rso_stop(struct wlan_objmgr_pdev *pdev,
*/
default:
#ifndef FEATURE_CM_ENABLE
/* For LFR2 BTM request, need handoff even roam disabled */
if (reason == REASON_OS_REQUESTED_ROAMING_NOW)
wlan_cm_roam_neighbor_proceed_with_handoff_req(vdev_id);
#endif
return QDF_STATUS_SUCCESS;
}
mlme_set_roam_state(psoc, vdev_id, WLAN_ROAM_RSO_STOPPED);
@@ -3019,24 +2996,6 @@ cm_roam_switch_to_rso_stop(struct wlan_objmgr_pdev *pdev,
return QDF_STATUS_SUCCESS;
}
#ifndef FEATURE_CM_ENABLE
static void cm_roam_roam_invoke_in_progress(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id, bool set)
{
struct wlan_objmgr_vdev *vdev;
struct mlme_roam_after_data_stall *vdev_roam_params;
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
WLAN_MLME_NB_ID);
if (!vdev)
return;
vdev_roam_params = mlme_get_roam_invoke_params(vdev);
if (vdev_roam_params)
vdev_roam_params->roam_invoke_in_progress = set;
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);
}
#endif
/**
* cm_roam_switch_to_deinit() - roam state handling for roam deinit
* @pdev: pdev pointer
@@ -3057,9 +3016,6 @@ cm_roam_switch_to_deinit(struct wlan_objmgr_pdev *pdev,
enum roam_offload_state cur_state = mlme_get_roam_state(psoc, vdev_id);
bool sup_disabled_roam;
#ifndef FEATURE_CM_ENABLE
cm_roam_roam_invoke_in_progress(psoc, vdev_id, false);
#endif
switch (cur_state) {
/*
* If RSO stop is not done already, send RSO stop first and
@@ -3160,11 +3116,6 @@ cm_roam_switch_to_init(struct wlan_objmgr_pdev *pdev,
return QDF_STATUS_E_FAILURE;
dual_sta_policy = &mlme_obj->cfg.gen.dual_sta_policy;
#ifndef FEATURE_CM_ENABLE
cm_roam_roam_invoke_in_progress(psoc, vdev_id, false);
#endif
dual_sta_roam_active =
wlan_mlme_get_dual_sta_roaming_enabled(psoc);
@@ -3425,12 +3376,8 @@ cm_roam_switch_to_roam_start(struct wlan_objmgr_pdev *pdev,
* notification. Allow roam start in this condition.
*/
if (mlme_get_supplicant_disabled_roaming(psoc, vdev_id) &&
#ifdef FEATURE_CM_ENABLE
wlan_cm_roaming_in_progress(pdev, vdev_id)
#else
mlme_is_roam_invoke_in_progress(psoc, vdev_id)
#endif
) {
wlan_cm_roaming_in_progress(pdev, vdev_id)) {
mlme_set_roam_state(psoc, vdev_id,
WLAN_ROAMING_IN_PROG);
break;
@@ -3474,12 +3421,7 @@ cm_roam_switch_to_roam_sync(struct wlan_objmgr_pdev *pdev,
* deauth roam trigger to stop data path queues
*/
case WLAN_ROAMING_IN_PROG:
#ifdef FEATURE_CM_ENABLE
if (!cm_is_vdevid_active(pdev, vdev_id))
#else
if (!wlan_cm_is_sta_connected(vdev_id))
#endif
{
if (!cm_is_vdevid_active(pdev, vdev_id)) {
mlme_err("ROAM: STA not in connected state");
return QDF_STATUS_E_FAILURE;
}
@@ -3493,12 +3435,7 @@ cm_roam_switch_to_roam_sync(struct wlan_objmgr_pdev *pdev,
* this state transition
*/
if (mlme_get_supplicant_disabled_roaming(psoc, vdev_id) &&
#ifdef FEATURE_CM_ENABLE
wlan_cm_roaming_in_progress(pdev, vdev_id)
#else
mlme_is_roam_invoke_in_progress(psoc, vdev_id)
#endif
) {
wlan_cm_roaming_in_progress(pdev, vdev_id)) {
mlme_set_roam_state(psoc, vdev_id,
WLAN_ROAM_SYNCH_IN_PROG);
break;
@@ -4434,7 +4371,6 @@ rel_vdev_ref:
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
}
#ifdef FEATURE_CM_ENABLE
QDF_STATUS cm_start_roam_invoke(struct wlan_objmgr_psoc *psoc,
struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid,
@@ -4685,4 +4621,3 @@ bool cm_roam_offload_enabled(struct wlan_objmgr_psoc *psoc)
return val;
}
#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
#endif /* FEATURE_CM_ENABLE */

2
components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.h
View File

@@ -109,7 +109,6 @@ cm_roam_fill_rssi_change_params(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
*/
void cm_dump_freq_list(struct rso_chan_info *chan_info);
#ifdef FEATURE_CM_ENABLE
/**
* cm_start_roam_invoke() - Validate and send Roam invoke req to CM
* @pdev: Pdev pointer
@@ -127,7 +126,6 @@ cm_start_roam_invoke(struct wlan_objmgr_psoc *psoc,
uint32_t chan_freq,
enum wlan_cm_source source);
#endif
#endif
#ifdef FEATURE_WLAN_ESE
/**

2
components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload_event.c
View File

@@ -32,7 +32,6 @@
#include "wlan_serialization_api.h"
#include "wlan_cm_roam_api.h"
#include <wlan_cfg80211_scan.h>
#ifdef FEATURE_CM_ENABLE
#include "connection_mgr/core/src/wlan_cm_roam.h"
#include "connection_mgr/core/src/wlan_cm_sm.h"
#include "connection_mgr/core/src/wlan_cm_main_api.h"
@@ -334,4 +333,3 @@ rel_ref:
return status;
}
#endif /*FEATURE_CM_ENABLE */

25
components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_api.h
View File

@@ -26,13 +26,10 @@
#include <wlan_cm_public_struct.h>
#include "scheduler_api.h"
#ifdef FEATURE_CM_ENABLE
#include "connection_mgr/core/src/wlan_cm_main.h"
#include "connection_mgr/core/src/wlan_cm_main_api.h"
#endif
#include <wlan_cm_roam_api.h>
#ifdef FEATURE_CM_ENABLE
/**
* struct cm_vdev_join_req - connect req from legacy CM to vdev manager
* @vdev_id: vdev id
@@ -142,7 +139,6 @@ struct cm_host_roam_start_ind {
struct cm_ext_obj {
struct rso_config rso_cfg;
};
#endif
#ifdef WLAN_FEATURE_FILS_SK
/**
@@ -248,26 +244,6 @@ void cm_csr_set_idle(uint8_t vdev_id);
int8_t cm_get_rssi_by_bssid(struct wlan_objmgr_pdev *pdev,
struct qdf_mac_addr *bssid);
#ifndef FEATURE_CM_ENABLE
/**
* cm_csr_is_handoff_in_progress() - CM CSR API to check handoff in progress
* @vdev_id: vdev_id
*
* Return: true if handoff is in progress, else false
*/
bool cm_csr_is_handoff_in_progress(uint8_t vdev_id);
/**
* cm_csr_disconnect_on_wait_key_timeout() - CM CSR API to issue disconnect on
* wait for key timeout
* @vdev_id: vdev_id
*
* Return: None
*/
void cm_csr_disconnect_on_wait_key_timeout(uint8_t vdev_id);
#endif
#ifdef FEATURE_CM_ENABLE
static inline QDF_STATUS
cm_ext_hdl_create(struct wlan_objmgr_vdev *vdev, cm_ext_t **ext_cm_ptr)
{
@@ -670,5 +646,4 @@ QDF_STATUS wlan_cm_send_connect_rsp(struct scheduler_msg *msg);
* Return: void
*/
void wlan_cm_free_connect_rsp(struct cm_vdev_join_rsp *rsp);
#endif /* FEATURE_CM_ENABLE */
#endif /* __WLAN_CM_VDEV_API_H__ */

17
components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_connect.c
View File

@@ -78,7 +78,6 @@ void cm_update_hlp_info(struct wlan_objmgr_vdev *vdev,
}
#endif
#ifdef FEATURE_CM_ENABLE
static bool wlan_cm_is_vdev_id_roam_reassoc_state(struct wlan_objmgr_vdev *vdev)
{
return wlan_cm_is_vdev_roam_reassoc_state(vdev);
@@ -91,19 +90,6 @@ wlan_cm_disconnect_on_wait_key_timeout(struct wlan_objmgr_psoc *psoc,
cm_disconnect(psoc, vdev->vdev_objmgr.vdev_id, CM_MLME_DISCONNECT,
REASON_KEY_TIMEOUT, NULL);
}
#else
static bool wlan_cm_is_vdev_id_roam_reassoc_state(struct wlan_objmgr_vdev *vdev)
{
return cm_csr_is_handoff_in_progress(vdev->vdev_objmgr.vdev_id);
}
static void
wlan_cm_disconnect_on_wait_key_timeout(struct wlan_objmgr_psoc *psoc,
struct wlan_objmgr_vdev *vdev)
{
cm_csr_disconnect_on_wait_key_timeout(vdev->vdev_objmgr.vdev_id);
}
#endif
void cm_wait_for_key_time_out_handler(void *data)
{
@@ -969,7 +955,6 @@ void cm_get_sta_cxn_info(struct wlan_objmgr_vdev *vdev,
#endif
#endif
#ifdef FEATURE_CM_ENABLE
QDF_STATUS cm_connect_start_ind(struct wlan_objmgr_vdev *vdev,
struct wlan_cm_connect_req *req)
{
@@ -1460,5 +1445,3 @@ bool cm_is_vdevid_active(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
return active;
}
#endif

4
components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_disconnect.c
View File

@@ -30,11 +30,8 @@
#include <wlan_objmgr_vdev_obj.h>
#include <wlan_cm_roam_api.h>
#include "wni_api.h"
#ifdef FEATURE_CM_ENABLE
#include "connection_mgr/core/src/wlan_cm_roam.h"
#endif
#ifdef FEATURE_CM_ENABLE
QDF_STATUS cm_disconnect_start_ind(struct wlan_objmgr_vdev *vdev,
struct wlan_cm_disconnect_req *req)
{
@@ -438,4 +435,3 @@ QDF_STATUS cm_handle_disconnect_resp(struct scheduler_msg *msg)
return QDF_STATUS_SUCCESS;
}
#endif

60
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h
View File

@@ -89,47 +89,6 @@ QDF_STATUS
wlan_roam_update_cfg(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
uint8_t reason);
#ifndef FEATURE_CM_ENABLE
/**
* wlan_cm_roam_cmd_allowed() - check roam cmd is allowed or not
* @psoc: pointer to psoc object
* @vdev_id: vdev id
* @rso_command: roam scan offload command
* @reason: reason to roam
*
* This function gets called to check roam cmd is allowed or not
*
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_cm_roam_cmd_allowed(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
uint8_t rso_command, uint8_t reason);
/**
* wlan_cm_roam_neighbor_proceed_with_handoff_req() - invoke host handover to
* new AP
* @vdev_id: vdev id
*
* This function gets called to invoke host handover to new AP
*
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_cm_roam_neighbor_proceed_with_handoff_req(uint8_t vdev_id);
/**
* wlan_cm_roam_scan_offload_rsp() - send roam scan offload response message
* @vdev_id: vdev id
* @reason: reason to roam
*
* This function gets called to send roam scan offload response message
*
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_cm_roam_scan_offload_rsp(uint8_t vdev_id, uint8_t reason);
#endif
/**
* wlan_cm_send_beacon_miss() - initiate beacon miss
* @vdev_id: vdev id
@@ -523,21 +482,6 @@ struct wlan_fils_connection_info *wlan_cm_get_fils_connection_info(
struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id);
#ifndef FEATURE_CM_ENABLE
/**
* wlan_cm_update_mlme_fils_connection_info - Update FILS connection info
* to mlme vdev private object
* @psoc: Pointer to psoc object
* @src_fils_info: Current profile FILS connection information
* @vdev_id: vdev_id
*
* Return: QDF_STATUS
*/
QDF_STATUS wlan_cm_update_mlme_fils_connection_info(
struct wlan_objmgr_psoc *psoc,
struct wlan_fils_connection_info *src_fils_info,
uint8_t vdev_id);
#else
/**
* wlan_cm_update_mlme_fils_info - Update FILS connection info
* to mlme vdev private object
@@ -549,7 +493,7 @@ QDF_STATUS wlan_cm_update_mlme_fils_connection_info(
QDF_STATUS
wlan_cm_update_mlme_fils_info(struct wlan_objmgr_vdev *vdev,
struct wlan_fils_con_info *src_fils_info);
#endif
/**
* wlan_cm_update_fils_ft - Update the FILS FT derived to mlme
* @psoc: Psoc pointer
@@ -637,7 +581,6 @@ void cm_update_session_assoc_ie(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id,
struct element_info *assoc_ie);
#ifdef FEATURE_CM_ENABLE
/**
* wlan_cm_roam_invoke() - Validate and send Roam invoke req to CM
* @pdev: Pdev pointer
@@ -731,7 +674,6 @@ static inline QDF_STATUS wlan_cm_host_roam_start(struct scheduler_msg *msg)
return QDF_STATUS_SUCCESS;
}
#endif
#endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
/**

14
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h
View File

@@ -89,15 +89,9 @@
#define REASON_ROAM_ABORT 53
#define REASON_ROAM_SET_PRIMARY 54
#ifdef FEATURE_CM_ENABLE
#define FILS_MAX_KEYNAME_NAI_LENGTH WLAN_CM_FILS_MAX_KEYNAME_NAI_LENGTH
#define WLAN_FILS_MAX_REALM_LEN WLAN_CM_FILS_MAX_REALM_LEN
#define WLAN_FILS_MAX_RRK_LENGTH WLAN_CM_FILS_MAX_RRK_LENGTH
#else
#define FILS_MAX_KEYNAME_NAI_LENGTH 253
#define WLAN_FILS_MAX_REALM_LEN 255
#define WLAN_FILS_MAX_RRK_LENGTH 64
#endif
#define FILS_MAX_HLP_DATA_LEN 2048
@@ -113,7 +107,7 @@
#define MAX_BSSID_AVOID_LIST 16
#define MAX_BSSID_FAVORED 16
#if defined(FEATURE_CM_ENABLE) && defined(WLAN_FEATURE_HOST_ROAM)
#ifdef WLAN_FEATURE_HOST_ROAM
#define MAX_FTIE_SIZE CM_MAX_FTIE_SIZE
#else
#define MAX_FTIE_SIZE 384
@@ -267,7 +261,7 @@ enum roam_fail_params {
ROAM_FAIL_REASON,
};
#if defined(FEATURE_CM_ENABLE) && defined(WLAN_FEATURE_HOST_ROAM)
#ifdef WLAN_FEATURE_HOST_ROAM
/**
* srtuct reassoc_timer_ctx - reassoc timer context
* @pdev: pdev object pointer
@@ -330,7 +324,7 @@ struct reassoc_timer_ctx {
* @lost_link_rssi: lost link RSSI
*/
struct rso_config {
#if defined(FEATURE_CM_ENABLE) && defined(WLAN_FEATURE_HOST_ROAM)
#ifdef WLAN_FEATURE_HOST_ROAM
qdf_mc_timer_t reassoc_timer;
struct reassoc_timer_ctx ctx;
#endif
@@ -1732,11 +1726,9 @@ struct wlan_cm_roam_tx_ops {
struct wlan_roam_triggers *req);
QDF_STATUS (*send_roam_disable_config)(struct wlan_objmgr_vdev *vdev,
struct roam_disable_cfg *req);
#ifdef FEATURE_CM_ENABLE
QDF_STATUS (*send_roam_invoke_cmd)(struct wlan_objmgr_vdev *vdev,
struct roam_invoke_req *req);
QDF_STATUS (*send_roam_sync_complete_cmd)(struct wlan_objmgr_vdev *vdev);
#endif
};
/**

2
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_ucfg_api.h
View File

@@ -132,7 +132,6 @@ ucfg_cm_update_roam_scan_scheme_bitmap(struct wlan_objmgr_psoc *psoc,
}
#endif
#ifdef FEATURE_CM_ENABLE
/**
* ucfg_wlan_cm_roam_invoke() - Invokes Roam request
* @pdev: Pointer to pdev
@@ -162,6 +161,5 @@ ucfg_cm_update_fils_config(struct wlan_objmgr_psoc *psoc,
return QDF_STATUS_SUCCESS;
}
#endif
#endif
#endif /* _WLAN_CM_ROAM_UCFG_API_H_ */

2
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_tgt_if_tx_api.h
View File

@@ -131,7 +131,6 @@ QDF_STATUS wlan_cm_tgt_send_roam_triggers(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id,
struct wlan_roam_triggers *req);
#ifdef FEATURE_CM_ENABLE
/**
* wlan_cm_tgt_send_roam_triggers() - Send roam trigger command to FW
* @psoc: psoc pointer
@@ -154,7 +153,6 @@ QDF_STATUS
wlan_cm_tgt_send_roam_sync_complete_cmd(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id);
#endif
#endif
/**
* wlan_cm_tgt_send_roam_disable_config() - Send roam disable config command

105
components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c
View File

@@ -28,9 +28,7 @@
#include <../../core/src/wlan_cm_vdev_api.h>
#include "wlan_crypto_global_api.h"
#include <wlan_cm_api.h>
#ifdef FEATURE_CM_ENABLE
#include "connection_mgr/core/src/wlan_cm_roam.h"
#endif
/* Support for "Fast roaming" (i.e., ESE, LFR, or 802.11r.) */
#define BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN 15
@@ -232,7 +230,6 @@ release_ref:
return status;
}
#ifdef FEATURE_CM_ENABLE
bool wlan_cm_host_roam_in_progress(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id)
{
@@ -254,7 +251,6 @@ bool wlan_cm_host_roam_in_progress(struct wlan_objmgr_psoc *psoc,
return host_roam_in_progress;
}
#endif
QDF_STATUS wlan_cm_abort_rso(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
{
@@ -295,10 +291,6 @@ release_ref:
bool wlan_cm_roaming_in_progress(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
{
#ifndef FEATURE_CM_ENABLE
struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev);
QDF_STATUS status;
#endif
bool roaming_in_progress = false;
struct wlan_objmgr_vdev *vdev;
@@ -309,23 +301,7 @@ bool wlan_cm_roaming_in_progress(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
return roaming_in_progress;
}
/* this is temp change will be removed in near future */
#ifdef FEATURE_CM_ENABLE
roaming_in_progress = wlan_cm_is_vdev_roaming(vdev);
#else
status = cm_roam_acquire_lock(vdev);
if (QDF_IS_STATUS_ERROR(status))
goto release_ref;
if (MLME_IS_ROAM_SYNCH_IN_PROGRESS(psoc, vdev_id) ||
MLME_IS_ROAMING_IN_PROG(psoc, vdev_id) ||
mlme_is_roam_invoke_in_progress(psoc, vdev_id) ||
wlan_cm_host_roam_in_progress(psoc, vdev_id))
roaming_in_progress = true;
cm_roam_release_lock(vdev);
release_ref:
#endif
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
@@ -1180,7 +1156,7 @@ static void cm_rso_chan_to_freq_list(struct wlan_objmgr_pdev *pdev,
wlan_reg_legacy_chan_to_freq(pdev, chan_list[count]);
}
#if defined(FEATURE_CM_ENABLE) && defined(WLAN_FEATURE_HOST_ROAM)
#ifdef WLAN_FEATURE_HOST_ROAM
static QDF_STATUS cm_init_reassoc_timer(struct rso_config *rso_cfg)
{
QDF_STATUS status;
@@ -1237,9 +1213,7 @@ QDF_STATUS wlan_cm_rso_config_init(struct wlan_objmgr_vdev *vdev,
if (QDF_IS_STATUS_ERROR(status))
return status;
#ifdef FEATURE_CM_ENABLE
qdf_mutex_create(&rso_cfg->cm_rso_lock);
#endif
cfg_params = &rso_cfg->cfg_param;
cfg_params->max_chan_scan_time =
mlme_obj->cfg.lfr.neighbor_scan_max_chan_time;
@@ -1344,13 +1318,11 @@ void wlan_cm_rso_config_deinit(struct wlan_objmgr_vdev *vdev,
cm_flush_roam_channel_list(&cfg_params->specific_chan_info);
cm_flush_roam_channel_list(&cfg_params->pref_chan_info);
#ifdef FEATURE_CM_ENABLE
qdf_mutex_destroy(&rso_cfg->cm_rso_lock);
#endif
cm_deinit_reassoc_timer(rso_cfg);
}
#ifdef FEATURE_CM_ENABLE
struct rso_config *wlan_cm_get_rso_config_fl(struct wlan_objmgr_vdev *vdev,
const char *func, uint32_t line)
@@ -1501,28 +1473,6 @@ QDF_STATUS cm_mlme_roam_preauth_fail(struct wlan_objmgr_vdev *vdev,
}
#endif
#else
struct rso_config *wlan_cm_get_rso_config_fl(struct wlan_objmgr_vdev *vdev,
const char *func, uint32_t line)
{
struct mlme_legacy_priv *mlme_priv;
enum QDF_OPMODE op_mode = wlan_vdev_mlme_get_opmode(vdev);
/* get only for CLI and STA */
if (op_mode != QDF_STA_MODE && op_mode != QDF_P2P_CLIENT_MODE)
return NULL;
mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
if (!mlme_priv) {
mlme_nofl_err("%s:%u: vdev %d legacy private object is NULL",
func, line, wlan_vdev_get_id(vdev));
return NULL;
}
return &mlme_priv->rso_cfg;
}
#endif
void wlan_cm_fill_crypto_filter_from_vdev(struct wlan_objmgr_vdev *vdev,
struct scan_filter *filter)
{
@@ -1746,56 +1696,6 @@ rel_vdev_ref:
}
#ifdef WLAN_FEATURE_FILS_SK
#ifndef FEATURE_CM_ENABLE
QDF_STATUS wlan_cm_update_mlme_fils_connection_info(
struct wlan_objmgr_psoc *psoc,
struct wlan_fils_connection_info *src_fils_info,
uint8_t vdev_id)
{
struct wlan_objmgr_vdev *vdev;
struct mlme_legacy_priv *mlme_priv;
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
WLAN_MLME_NB_ID);
if (!vdev) {
mlme_err("vdev object is NULL");
return QDF_STATUS_E_FAILURE;
}
mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
if (!mlme_priv) {
mlme_err("vdev legacy private object is NULL");
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);
return QDF_STATUS_E_FAILURE;
}
if (!src_fils_info) {
mlme_debug("FILS: vdev:%d Clear fils info", vdev_id);
qdf_mem_free(mlme_priv->connect_info.fils_con_info);
mlme_priv->connect_info.fils_con_info = NULL;
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);
return QDF_STATUS_SUCCESS;
}
if (mlme_priv->connect_info.fils_con_info)
qdf_mem_free(mlme_priv->connect_info.fils_con_info);
mlme_priv->connect_info.fils_con_info =
qdf_mem_malloc(sizeof(struct wlan_fils_connection_info));
if (!mlme_priv->connect_info.fils_con_info) {
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);
return QDF_STATUS_E_NOMEM;
}
mlme_debug("FILS: vdev:%d update fils info", vdev_id);
qdf_mem_copy(mlme_priv->connect_info.fils_con_info, src_fils_info,
sizeof(struct wlan_fils_connection_info));
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_NB_ID);
return QDF_STATUS_SUCCESS;
}
#else
QDF_STATUS
wlan_cm_update_mlme_fils_info(struct wlan_objmgr_vdev *vdev,
struct wlan_fils_con_info *src_fils_info)
@@ -1845,7 +1745,6 @@ wlan_cm_update_mlme_fils_info(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_SUCCESS;
}
#endif
void wlan_cm_update_hlp_info(struct wlan_objmgr_psoc *psoc,
const uint8_t *gen_ie, uint16_t len,

3
components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_ucfg_api.c
View File

@@ -230,7 +230,6 @@ QDF_STATUS ucfg_cm_set_cckm_ie(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
#endif
#ifdef FEATURE_CM_ENABLE
#ifdef WLAN_FEATURE_FILS_SK
QDF_STATUS
ucfg_cm_update_fils_config(struct wlan_objmgr_psoc *psoc,
@@ -261,5 +260,3 @@ ucfg_wlan_cm_roam_invoke(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
{
return wlan_cm_roam_invoke(pdev, vdev_id, bssid, ch_freq, source);
}
#endif

2
components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_tgt_if_tx_api.c
View File

@@ -428,7 +428,6 @@ QDF_STATUS wlan_cm_tgt_send_roam_disable_config(struct wlan_objmgr_psoc *psoc,
return status;
}
#ifdef FEATURE_CM_ENABLE
QDF_STATUS
wlan_cm_tgt_send_roam_invoke_req(struct wlan_objmgr_psoc *psoc,
struct roam_invoke_req *roam_invoke_req)
@@ -494,4 +493,3 @@ wlan_cm_tgt_send_roam_sync_complete_cmd(struct wlan_objmgr_psoc *psoc,
return status;
}
#endif