From 52d83220cc19f06cdbf08d84cd40aa3e89bbfdc5 Mon Sep 17 00:00:00 2001 From: Arun Kumar Khandavalli Date: Fri, 12 May 2023 07:11:15 +0530 Subject: [PATCH] qcacld-3.0: Set the 11be in feature set based on capability Currently the 11be capability is set to true from host if the 11be macro is enabled intersect the same with the ini configuration and update the feature set accordingly. Change-Id: Ifbd4207a5113fafe5e8ebb87c6b7fce6c2a29eff CRs-Fixed: 3495617 --- core/hdd/src/wlan_hdd_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 9b635ab261..fb9e23ae4d 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -13699,11 +13699,18 @@ static bool hdd_is_cfg_dot11_mode_11be(enum hdd_dot11_mode dot11_mode) /** * hdd_is_11be_supported() - Check if 11be is supported or not + * @hdd_ctx: Pointer to hdd context * * Return: True, if 11be is supported else return false */ -static bool hdd_is_11be_supported(void) +static bool hdd_is_11be_supported(struct hdd_context *hdd_ctx) { + bool mlo_capab; + + ucfg_psoc_mlme_get_11be_capab(hdd_ctx->psoc, &mlo_capab); + if (!mlo_capab) + return false; + return true; } #else @@ -13713,7 +13720,7 @@ static bool hdd_is_cfg_dot11_mode_11be(enum hdd_dot11_mode dot11_mode) return false; } -static bool hdd_is_11be_supported(void) +static bool hdd_is_11be_supported(struct hdd_context *hdd_ctx) { return false; } @@ -13732,7 +13739,7 @@ static WMI_HOST_WIFI_STANDARD hdd_get_wifi_standard(struct hdd_context *hdd_ctx, WMI_HOST_WIFI_STANDARD wifi_standard = WMI_HOST_WIFI_STANDARD_4; if (hdd_ctx->config->dot11Mode == eHDD_DOT11_MODE_AUTO) { - if (hdd_is_11be_supported()) + if (hdd_is_11be_supported(hdd_ctx)) wifi_standard = WMI_HOST_WIFI_STANDARD_7; else if (band_capability & BIT(REG_BAND_6G)) wifi_standard = WMI_HOST_WIFI_STANDARD_6E;