From 3edd04f7eb24d36b8ae38480e190df12ff68d8c2 Mon Sep 17 00:00:00 2001 From: Aditya Kodukula Date: Tue, 23 Feb 2021 20:17:21 -0800 Subject: [PATCH] qcacld-3.0: Validate 2.4 GHz band before accessing it Add a safety check to verify if the 2.4GHz band is enabled/supported before updating the target config. Change-Id: I05c0ac956acee0cd9550114836a0d41cfc3359ed CRs-Fixed: 2883567 --- core/hdd/src/wlan_hdd_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index a3545b0e1f5c..79ee4a2ef7ff 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1809,7 +1809,13 @@ static void hdd_update_wiphy_vhtcap(struct hdd_context *hdd_ctx) ucfg_mlme_cfg_get_vht_tx_mcs_map(hdd_ctx->psoc, &value2); band_5g->vht_cap.vht_mcs.tx_mcs_map = value2; + + if (!band_2g) { + hdd_debug("2GHz band disabled, skipping capability population"); + return; + } ucfg_mlme_get_vht_for_24ghz(hdd_ctx->psoc, &is_vht_24ghz); + if (is_vht_24ghz) band_2g->vht_cap.vht_mcs.tx_mcs_map = value2; }