ソースを参照

qcacld-3.0: Remove condition never will hit

Variable roam_now in function csr_neighbor_roam_process_handoff_req()
is initialized as 0 and never be assigned a new value, so it will
always fall to csr_scan_for_ssid() when roaming happen with LFR2.0
enabled.

CERT case MBO-5.2.6 requires BTM reassociation happen within a short
time, otherwise AP will disassociate it and fails this case, it takes
more time if we do roaming scan after BTM response and roaming
candidate bss is ready.

When it is propagated from legacy branch, roam_now is a return value
from csrNeighborRoamProcessScanResults(), but after converged, this
function has no return value, and none zero roamable_ap_count can
indicate candidate ap is ready and we can roam now.

Change-Id: I5f2bd85abf0f7c1488ae729fc48332a92b4d133d
CRs-fixed: 2762476
Will Huang 4 年 前
コミット
762cc0fd12
1 ファイル変更2 行追加4 行削除
  1. 2 4
      core/sme/src/csr/csr_neighbor_roam.c

+ 2 - 4
core/sme/src/csr/csr_neighbor_roam.c

@@ -1325,7 +1325,6 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 	struct csr_roam_profile *profile = NULL;
 	struct csr_roam_session *session = CSR_GET_SESSION(mac_ctx, session_id);
 	uint8_t i = 0;
-	uint8_t roam_now = 0;
 	uint8_t roamable_ap_count = 0;
 	struct scan_filter *scan_filter;
 	tScanResultHandle       scan_result;
@@ -1403,10 +1402,9 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 							&scan_result);
 		roamable_ap_count = csr_ll_count(
 					&roam_ctrl_info->roamableAPList);
-		sme_debug("roam_now=%d, roamable_ap_count=%d",
-			roam_now, roamable_ap_count);
+		sme_debug("roamable_ap_count=%d", roamable_ap_count);
 	}
-	if (roam_now && roamable_ap_count) {
+	if (roamable_ap_count) {
 		csr_neighbor_roam_trigger_handoff(mac_ctx, session_id);
 	} else {
 		status = csr_scan_for_ssid(mac_ctx, session_id, profile,