From fb85fcd3b0c600e6c87cc7d248144a56b283e93c Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Fri, 17 Sep 2021 14:03:55 -0700 Subject: [PATCH] qcacld-3.0: Disable 6G security check if RF testmode is enabled The 6GHz security check is enabled by default. Disable the check if RF test mode is enabled. Change-Id: Id6af514f6a31f6351b1b0d784c2b9f7d301496c0 CRs-Fixed: 3040621 --- components/mlme/dispatcher/inc/cfg_mlme_generic.h | 4 ++-- core/hdd/src/wlan_hdd_main.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/mlme/dispatcher/inc/cfg_mlme_generic.h b/components/mlme/dispatcher/inc/cfg_mlme_generic.h index 845fe4157f..adf62c81f1 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_generic.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_generic.h @@ -164,7 +164,7 @@ enum wlan_wds_mode { * rf_test_mode_enabled - Enable rf test mode support * @Min: 0 * @Max: 1 - * @Default: 1 + * @Default: 0 * * This cfg is used to set rf test mode support flag * @@ -174,7 +174,7 @@ enum wlan_wds_mode { */ #define CFG_RF_TEST_MODE_SUPP_ENABLED CFG_BOOL( \ "rf_test_mode_enabled", \ - 1, \ + 0, \ "rf test mode Enable Flag") /* diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index c8f51fca7b..284fef4d91 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -13707,6 +13707,10 @@ static int hdd_features_init(struct hdd_context *hdd_ctx) wlan_cm_set_check_6ghz_security(hdd_ctx->psoc, true); wlan_cm_set_6ghz_key_mgmt_mask(hdd_ctx->psoc, ALLOWED_KEYMGMT_6G_MASK); + } else { + wlan_cm_set_check_6ghz_security(hdd_ctx->psoc, false); + wlan_cm_set_6ghz_key_mgmt_mask(hdd_ctx->psoc, + DEFAULT_KEYMGMT_6G_MASK); } hdd_thermal_stats_cmd_init(hdd_ctx);