From b8b1b51f32fa2956d07715043bcf9bfcd629bd63 Mon Sep 17 00:00:00 2001 From: Huashan Qu Date: Wed, 29 Dec 2021 17:40:28 +0800 Subject: [PATCH] qcacmn: Give SAE-PK AP more score to pass SAE-5.7.3 certification When do SAE-5.7.3 certification test case, STA will choose non SAE-PK AP to connect which is wrong expected result, non SAE-PK AP beacon will carry with QBSS IE that contributes more score than SAE-PK AP score config. Fix is to give SAE-PK AP more score to pass SAE-5.7.3 certification case. Change-Id: Ib3e516ccfa673e19f9bf0869aeffe4f5b1862a71 CRs-Fixed: 3101317 --- umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c | 2 +- .../dispatcher/inc/cfg_mlme_score_params.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c b/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c index 10b0805bbae6..843c042f6cc9 100644 --- a/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c +++ b/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c @@ -88,7 +88,7 @@ #define CM_OCE_WAN_WEIGHTAGE 2 #define CM_OCE_AP_TX_POWER_WEIGHTAGE 5 #define CM_OCE_SUBNET_ID_WEIGHTAGE 3 -#define CM_SAE_PK_AP_WEIGHTAGE 3 +#define CM_SAE_PK_AP_WEIGHTAGE 30 #define CM_BEST_CANDIDATE_MAX_WEIGHT 200 #define CM_MAX_PCT_SCORE 100 #define CM_MAX_INDEX_PER_INI 4 diff --git a/umac/mlme/connection_mgr/dispatcher/inc/cfg_mlme_score_params.h b/umac/mlme/connection_mgr/dispatcher/inc/cfg_mlme_score_params.h index 44cc92f4eeb0..1e1e4a522723 100644 --- a/umac/mlme/connection_mgr/dispatcher/inc/cfg_mlme_score_params.h +++ b/umac/mlme/connection_mgr/dispatcher/inc/cfg_mlme_score_params.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -384,8 +385,8 @@ * * sae_pk_ap_weightage - update scoring param based on SAE PK ap weightage * @Min: 0 - * @Max: 10 - * @Default: 3 + * @Max: 30 + * @Default: 30 * * This ini is used to calculate SAE PK ap weightage in roam score. SAE Public * Key (SAE-PK) authentication is an extension of SAE that is intended for use @@ -405,8 +406,8 @@ #define CFG_SAE_PK_AP_WEIGHTAGE CFG_INI_UINT( \ "sae_pk_ap_weightage", \ 0, \ - 10, \ - PLATFORM_VALUE(3, 0), \ + 30, \ + PLATFORM_VALUE(30, 0), \ CFG_VALUE_OR_DEFAULT,\ "SAE-PK AP weightage")