From 33fdd1fac04cdbc23f939ad5aa51aafe47747dab Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Wed, 26 Aug 2020 23:37:52 +0530 Subject: [PATCH] qcacld-3.0: Remove unused roam ini gRoamBeaconRssiWeight Currently, gRoamBeaconRssiWeight is not used in HOST or FW. Remove unused roam ini param gRoamBeaconRssiWeight. Change-Id: Ida6ddb8ca5805f819c4d3f7e6ed96c705fa6594f CRs-Fixed: 2767533 --- components/mlme/core/src/wlan_mlme_main.c | 2 -- components/mlme/dispatcher/inc/cfg_mlme_lfr.h | 25 ------------------- .../dispatcher/inc/wlan_mlme_public_struct.h | 1 - .../inc/wlan_cm_roam_public_struct.h | 1 - components/wmi/inc/wmi_unified_roam_api.h | 2 -- components/wmi/src/wmi_unified_roam_api.c | 3 +-- components/wmi/src/wmi_unified_roam_tlv.c | 8 ++---- core/mac/inc/sir_api.h | 1 - core/sme/inc/csr_neighbor_roam.h | 2 -- core/sme/src/csr/csr_api_roam.c | 2 -- core/sme/src/csr/csr_neighbor_roam.c | 21 ---------------- core/wma/src/wma_scan_roam.c | 6 +---- 12 files changed, 4 insertions(+), 70 deletions(-) diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 3ad1a83ce1..051ac35a16 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -1721,8 +1721,6 @@ static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc, cfg_get(psoc, CFG_LFR_ROAM_BMISS_FIRST_BCNT); lfr->roam_bmiss_final_bcnt = cfg_get(psoc, CFG_LFR_ROAM_BMISS_FINAL_BCNT); - lfr->roam_beacon_rssi_weight = - cfg_get(psoc, CFG_LFR_ROAM_BEACON_RSSI_WEIGHT); lfr->roaming_dfs_channel = cfg_get(psoc, CFG_LFR_ROAMING_DFS_CHANNEL); lfr->roam_scan_hi_rssi_maxcount = diff --git a/components/mlme/dispatcher/inc/cfg_mlme_lfr.h b/components/mlme/dispatcher/inc/cfg_mlme_lfr.h index d9d77d5fdb..38e93797e8 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_lfr.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_lfr.h @@ -1666,30 +1666,6 @@ CFG_VALUE_OR_DEFAULT, \ "Final beacon miss count") -/* - * - * gRoamBeaconRssiWeight - Set beacon miss weight - * @Min: 5 - * @Max: 16 - * @Default: 14 - * - * This ini controls how many beacons' RSSI values will be used to calculate - * the average value of RSSI. - * - * Related: None - * - * Usage: External - * - * - */ -#define CFG_LFR_ROAM_BEACON_RSSI_WEIGHT CFG_INI_UINT( \ - "gRoamBeaconRssiWeight", \ - 0, \ - 16, \ - 14, \ - CFG_VALUE_OR_DEFAULT, \ - "Beacon miss weight") - /* * * gAllowDFSChannelRoam - Allow dfs channel in roam @@ -2936,7 +2912,6 @@ CFG(CFG_LFR_EMPTY_SCAN_REFRESH_PERIOD) \ CFG(CFG_LFR_ROAM_BMISS_FIRST_BCNT) \ CFG(CFG_LFR_ROAM_BMISS_FINAL_BCNT) \ - CFG(CFG_LFR_ROAM_BEACON_RSSI_WEIGHT) \ CFG(CFG_LFR_ROAMING_DFS_CHANNEL) \ CFG(CFG_LFR_ROAM_SCAN_HI_RSSI_MAXCOUNT) \ CFG(CFG_LFR_ROAM_SCAN_HI_RSSI_DELTA) \ diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h index 897e688951..8911d13d97 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h @@ -1737,7 +1737,6 @@ struct wlan_mlme_lfr_cfg { uint32_t empty_scan_refresh_period; uint8_t roam_bmiss_first_bcnt; uint8_t roam_bmiss_final_bcnt; - uint32_t roam_beacon_rssi_weight; enum roaming_dfs_channel_type roaming_dfs_channel; uint32_t roam_scan_hi_rssi_maxcount; uint32_t roam_scan_hi_rssi_delta; diff --git a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h index 7b3238846a..7fa224f25f 100644 --- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h +++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h @@ -55,7 +55,6 @@ #define REASON_ROAM_RESCAN_RSSI_DIFF_CHANGED 19 #define REASON_ROAM_BMISS_FIRST_BCNT_CHANGED 20 #define REASON_ROAM_BMISS_FINAL_BCNT_CHANGED 21 -#define REASON_ROAM_BEACON_RSSI_WEIGHT_CHANGED 22 #define REASON_ROAM_DFS_SCAN_MODE_CHANGED 23 #define REASON_ROAM_ABORT_ROAM_SCAN 24 #define REASON_ROAM_EXT_SCAN_PARAMS_CHANGED 25 diff --git a/components/wmi/inc/wmi_unified_roam_api.h b/components/wmi/inc/wmi_unified_roam_api.h index a8f8273c15..554d1511b7 100644 --- a/components/wmi/inc/wmi_unified_roam_api.h +++ b/components/wmi/inc/wmi_unified_roam_api.h @@ -362,7 +362,6 @@ wmi_unified_roam_scan_offload_rssi_change_cmd( * wmi_unified_roam_scan_offload_rssi_change_cmd() - set roam offload RSSI th * @wmi_handle: wmi handle * @rssi_change_thresh: RSSI Change threshold - * @bcn_rssi_weight: beacon RSSI weight * @vdev_id: vdev id * * Send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD parameters to fw. @@ -373,7 +372,6 @@ QDF_STATUS wmi_unified_roam_scan_offload_rssi_change_cmd(wmi_unified_t wmi_handle, uint32_t vdev_id, int32_t rssi_change_thresh, - uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans); /** diff --git a/components/wmi/src/wmi_unified_roam_api.c b/components/wmi/src/wmi_unified_roam_api.c index 1ec8bc5c59..857198c71c 100644 --- a/components/wmi/src/wmi_unified_roam_api.c +++ b/components/wmi/src/wmi_unified_roam_api.c @@ -302,13 +302,12 @@ QDF_STATUS wmi_unified_roam_scan_offload_rssi_change_cmd(wmi_unified_t wmi_handle, uint32_t vdev_id, int32_t rssi_change_thresh, - uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans) { if (wmi_handle->ops->send_roam_scan_offload_rssi_change_cmd) return wmi_handle->ops->send_roam_scan_offload_rssi_change_cmd( wmi_handle, vdev_id, rssi_change_thresh, - bcn_rssi_weight, hirssi_delay_btw_scans); + hirssi_delay_btw_scans); return QDF_STATUS_E_FAILURE; } diff --git a/components/wmi/src/wmi_unified_roam_tlv.c b/components/wmi/src/wmi_unified_roam_tlv.c index 0e5f00e803..81feb2a690 100644 --- a/components/wmi/src/wmi_unified_roam_tlv.c +++ b/components/wmi/src/wmi_unified_roam_tlv.c @@ -3445,7 +3445,6 @@ error: * send_roam_scan_offload_rssi_change_cmd_tlv() - set roam offload RSSI th * @wmi_handle: wmi handle * @rssi_change_thresh: RSSI Change threshold - * @bcn_rssi_weight: beacon RSSI weight * @vdev_id: vdev id * * Send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD parameters to fw. @@ -3456,7 +3455,6 @@ static QDF_STATUS send_roam_scan_offload_rssi_change_cmd_tlv(wmi_unified_t wmi_handle, uint32_t vdev_id, int32_t rssi_change_thresh, - uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans) { wmi_buf_t buf = NULL; @@ -3481,7 +3479,6 @@ send_roam_scan_offload_rssi_change_cmd_tlv(wmi_unified_t wmi_handle, /* fill in rssi change threshold (hysteresis) values */ rssi_change_fp->vdev_id = vdev_id; rssi_change_fp->roam_scan_rssi_change_thresh = rssi_change_thresh; - rssi_change_fp->bcn_rssi_weight = bcn_rssi_weight; rssi_change_fp->hirssi_delay_btw_scans = hirssi_delay_btw_scans; wmi_mtrace(WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD, NO_SESSION, 0); @@ -3490,9 +3487,8 @@ send_roam_scan_offload_rssi_change_cmd_tlv(wmi_unified_t wmi_handle, if (QDF_IS_STATUS_ERROR(status)) goto error; - wmi_nofl_debug("roam_scan_rssi_change_thresh %d bcn_rssi_weight %d hirssi_delay_btw_scans %d", - rssi_change_thresh, bcn_rssi_weight, - hirssi_delay_btw_scans); + wmi_nofl_debug("roam_scan_rssi_change_thresh %d hirssi_delay_btw_scans %d", + rssi_change_thresh, hirssi_delay_btw_scans); return QDF_STATUS_SUCCESS; error: diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index b8fbf7c75f..fb24d2624c 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -2282,7 +2282,6 @@ struct roam_offload_scan_req { uint8_t sessionId; uint8_t RoamBmissFirstBcnt; uint8_t RoamBmissFinalBcnt; - uint8_t RoamBeaconRssiWeight; eSirDFSRoamScanMode allowDFSChannelRoam; #ifdef WLAN_FEATURE_ROAM_OFFLOAD uint8_t roam_offload_enabled; diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index f0342c8ef2..74dad6e7b2 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -58,7 +58,6 @@ typedef struct sCsrNeighborRoamCfgParams { uint8_t nRoamRescanRssiDiff; uint8_t nRoamBmissFirstBcnt; uint8_t nRoamBmissFinalBcnt; - uint8_t nRoamBeaconRssiWeight; uint8_t delay_before_vdev_stop; uint32_t hi_rssi_scan_max_count; uint32_t hi_rssi_scan_rssi_delta; @@ -153,7 +152,6 @@ typedef struct sCsrNeighborRoamControlInfo { tCsrHandoffRequest handoffReqInfo; uint8_t currentRoamBmissFirstBcnt; uint8_t currentRoamBmissFinalBcnt; - uint8_t currentRoamBeaconRssiWeight; uint8_t last_sent_cmd; struct scan_result_list *scan_res_lfr2_roam_ap; bool roam_control_enable; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 9afed9d310..2d5b1ed9e1 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -17690,8 +17690,6 @@ csr_create_roam_scan_offload_request(struct mac_context *mac_ctx, roam_info->cfgParams.nRoamBmissFirstBcnt; req_buf->RoamBmissFinalBcnt = roam_info->cfgParams.nRoamBmissFinalBcnt; - req_buf->RoamBeaconRssiWeight = - roam_info->cfgParams.nRoamBeaconRssiWeight; csr_copy_mawc_config(mac_ctx, &req_buf->mawc_roam_params); req_buf->min_rssi_params[DEAUTH_MIN_RSSI] = diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index a788f616fc..60cabbdabb 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -44,7 +44,6 @@ static const char *lfr_get_config_item_string(uint8_t reason) CASE_RETURN_STRING(REASON_ROAM_RESCAN_RSSI_DIFF_CHANGED); CASE_RETURN_STRING(REASON_ROAM_BMISS_FIRST_BCNT_CHANGED); CASE_RETURN_STRING(REASON_ROAM_BMISS_FINAL_BCNT_CHANGED); - CASE_RETURN_STRING(REASON_ROAM_BEACON_RSSI_WEIGHT_CHANGED); default: return "unknown"; } @@ -213,15 +212,6 @@ QDF_STATUS csr_neighbor_roam_update_config(struct mac_context *mac_ctx, cfg_params->nRoamBmissFinalBcnt = value; pNeighborRoamInfo->currentRoamBmissFinalBcnt = value; break; - case REASON_ROAM_BEACON_RSSI_WEIGHT_CHANGED: - old_value = cfg_params->nRoamBeaconRssiWeight; - cfg_params->nRoamBeaconRssiWeight = value; - pNeighborRoamInfo->currentRoamBeaconRssiWeight = value; - src_cfg.uint_value = value; - wlan_cm_roam_cfg_set_value(mac_ctx->psoc, session_id, - BEACON_RSSI_WEIGHT, - &src_cfg); - break; default: sme_debug("Unknown update cfg reason"); return QDF_STATUS_E_FAILURE; @@ -821,8 +811,6 @@ static void csr_neighbor_roam_info_ctx_init(struct mac_context *mac, ngbr_roam_info->cfgParams.nRoamBmissFirstBcnt; ngbr_roam_info->currentRoamBmissFinalBcnt = ngbr_roam_info->cfgParams.nRoamBmissFinalBcnt; - ngbr_roam_info->currentRoamBeaconRssiWeight = - ngbr_roam_info->cfgParams.nRoamBeaconRssiWeight; /* * Update RSSI change params to vdev @@ -831,10 +819,6 @@ static void csr_neighbor_roam_info_ctx_init(struct mac_context *mac, wlan_cm_roam_cfg_set_value(mac->psoc, session_id, RSSI_CHANGE_THRESHOLD, &src_cfg); - src_cfg.uint_value = mac->mlme_cfg->lfr.roam_beacon_rssi_weight; - wlan_cm_roam_cfg_set_value(mac->psoc, session_id, - BEACON_RSSI_WEIGHT, &src_cfg); - src_cfg.uint_value = mac->mlme_cfg->lfr.roam_scan_hi_rssi_delay; wlan_cm_roam_cfg_set_value(mac->psoc, session_id, HI_RSSI_DELAY_BTW_SCANS, &src_cfg); @@ -1078,9 +1062,6 @@ QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId) pNeighborRoamInfo->cfgParams.nRoamBmissFinalBcnt = mac->mlme_cfg->lfr.roam_bmiss_final_bcnt; - pNeighborRoamInfo->cfgParams.nRoamBeaconRssiWeight = - mac->mlme_cfg->lfr.roam_beacon_rssi_weight; - pNeighborRoamInfo->cfgParams.neighborScanPeriod = mac->mlme_cfg->lfr.neighbor_scan_timer_period; pNeighborRoamInfo->cfgParams.neighbor_scan_min_period = @@ -1154,8 +1135,6 @@ QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId) pNeighborRoamInfo->cfgParams.nRoamBmissFirstBcnt; pNeighborRoamInfo->currentRoamBmissFinalBcnt = pNeighborRoamInfo->cfgParams.nRoamBmissFinalBcnt; - pNeighborRoamInfo->currentRoamBeaconRssiWeight = - pNeighborRoamInfo->cfgParams.nRoamBeaconRssiWeight; qdf_mem_zero(&pNeighborRoamInfo->prevConnProfile, sizeof(tCsrRoamConnectedProfile)); diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index d2c6cb1ebe..f7d839f5cd 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -769,7 +769,6 @@ wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, * wma_roam_scan_offload_rssi_change() - set roam offload RSSI change threshold * @wma_handle: wma handle * @rssi_change_thresh: RSSI Change threshold - * @bcn_rssi_weight: beacon RSSI weight * @vdev_id: vdev id * * Send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD parameters to fw. @@ -779,7 +778,6 @@ wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, static QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t vdev_id, int32_t rssi_change_thresh, - uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans) { if (!wma_is_vdev_valid(vdev_id)) { @@ -790,7 +788,7 @@ static QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, return wmi_unified_roam_scan_offload_rssi_change_cmd( wma_handle->wmi_handle, vdev_id, rssi_change_thresh, - bcn_rssi_weight, hirssi_delay_btw_scans); + hirssi_delay_btw_scans); } /** @@ -2018,7 +2016,6 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, qdf_status = wma_roam_scan_offload_rssi_change(wma_handle, roam_req->sessionId, roam_req->RoamRescanRssiDiff, - roam_req->RoamBeaconRssiWeight, roam_req->hi_rssi_scan_delay); if (qdf_status != QDF_STATUS_SUCCESS) @@ -2308,7 +2305,6 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, qdf_status = wma_roam_scan_offload_rssi_change(wma_handle, roam_req->sessionId, roam_req->RoamRescanRssiDiff, - roam_req->RoamBeaconRssiWeight, roam_req->hi_rssi_scan_delay); if (qdf_status != QDF_STATUS_SUCCESS) break;