From 9713cd0293ab50d021bfec153104d2e75a42535d Mon Sep 17 00:00:00 2001 From: Madan Koyyalamudi Date: Tue, 13 Dec 2022 11:47:31 -0800 Subject: [PATCH 1/7] Release 2.0.8.31W Release 2.0.8.31W Change-Id: I7b38836d14b9ea6c1f06a22a4ca14d7b406279a9 CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 4b6d5d20b5a5..4a0c3e0d219f 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "V" +#define QWLAN_VERSION_EXTRA "W" #define QWLAN_VERSION_BUILD 31 -#define QWLAN_VERSIONSTR "2.0.8.31V" +#define QWLAN_VERSIONSTR "2.0.8.31W" #endif /* QWLAN_VERSION_H */ From 7a3a40a77a9804b4d06e925375f3c7e4ac1add73 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Myadam Date: Wed, 7 Dec 2022 15:57:42 +0530 Subject: [PATCH 2/7] qcacld-3.0: Change default value of gSoftApMaxPeers In the current driver implementation, the default ini value of gSoftApMaxPeers is set to 32, but for mobile devices, FW can only support 10 SAP peers at max. Hence, change the default value of gSoftApMaxPeers to 10. Change-Id: I8c5a2a8422f02bb464a11d823f8528ebb88bb34c CRs-Fixed: 3227078 --- components/mlme/dispatcher/inc/cfg_mlme_sap.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/mlme/dispatcher/inc/cfg_mlme_sap.h b/components/mlme/dispatcher/inc/cfg_mlme_sap.h index 894b6e9edf13..146ebb5b4cd0 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_sap.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_sap.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 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 @@ -261,7 +262,7 @@ * gSoftApMaxPeers - Set Max peers connected for SAP * @Min: 1 * @Max: 64 - * @Default: 32 + * @Default: 10 * * This ini is used to set Max peers connected for SAP * @@ -277,7 +278,7 @@ "gSoftApMaxPeers", \ 1, \ 64, \ - 32, \ + 10, \ CFG_VALUE_OR_DEFAULT, \ "max no of peers") From 0a1a87c7bdf057d2086b3184c077ed99bd8ed923 Mon Sep 17 00:00:00 2001 From: Madan Koyyalamudi Date: Fri, 23 Dec 2022 01:12:47 -0800 Subject: [PATCH 3/7] Release 2.0.8.31X Release 2.0.8.31X Change-Id: Ia7698f3498f3d2fad9442cbee7f8755086290e24 CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 4a0c3e0d219f..fe2c8ae7c0d7 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "W" +#define QWLAN_VERSION_EXTRA "X" #define QWLAN_VERSION_BUILD 31 -#define QWLAN_VERSIONSTR "2.0.8.31W" +#define QWLAN_VERSIONSTR "2.0.8.31X" #endif /* QWLAN_VERSION_H */ From d1372d6e6a71c9ddac28845c1e1bee922ff01bf5 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Fri, 30 Sep 2022 00:44:09 -0700 Subject: [PATCH 4/7] qcacld-3.0: Incorrect MCS index is passed Fix the potential out of bound read of the supported MCS rate array. Change-Id: I172dcac9d1ce79b16e4cd2a4ee321d9e93102866 CRs-Fixed: 3304227 --- core/hdd/src/wlan_hdd_hostapd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 9025e939a06c..afa99fb8bed5 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 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 @@ -1347,6 +1348,10 @@ static int calcuate_max_phy_rate(int mode, int nss, int ch_width, if (mode == SIR_SME_PHY_MODE_HT) { /* check for HT Mode */ maxidx = ht_mcs_idx; + if (maxidx > 7) { + hdd_err("ht_mcs_idx %d is incorrect", ht_mcs_idx); + return maxrate; + } if (nss == 1) { supported_mcs_rate = supported_mcs_rate_nss1; } else if (nss == 2) { From 9c9d6f82578128c6538a51c61bc96eb2341001c5 Mon Sep 17 00:00:00 2001 From: Madan Koyyalamudi Date: Fri, 23 Dec 2022 12:38:12 -0800 Subject: [PATCH 5/7] Release 2.0.8.31Y Release 2.0.8.31Y Change-Id: If244ada004a904352724a57c43d1b8e8f7d493e6 CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index fe2c8ae7c0d7..e0d09f298e35 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "X" +#define QWLAN_VERSION_EXTRA "Y" #define QWLAN_VERSION_BUILD 31 -#define QWLAN_VERSIONSTR "2.0.8.31X" +#define QWLAN_VERSIONSTR "2.0.8.31Y" #endif /* QWLAN_VERSION_H */ From 5307d19a75682a1064994441e885b50ccd3bd613 Mon Sep 17 00:00:00 2001 From: Asutosh Mohapatra Date: Tue, 29 Nov 2022 18:19:31 +0530 Subject: [PATCH 6/7] qcacld-3.0: Restrict mode change to FTM mode scenarios Currently if driver load/unload is in progress or driver is loaded and mode change to FTM mode is issued from the sys path, memory leakage occurs during driver unload. To address this issue, don't change mode if driver is already loaded or load/unload is in progress. Change-Id: I09cacaf11d516c62de1a9699547eb01476afdc1f CRs-Fixed: 3349217 --- core/hdd/src/wlan_hdd_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 1ee2bb2b65d9..1c010f73e6df 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -18090,6 +18090,11 @@ static int con_mode_handler_ftm(const char *kmessage, ret = param_set_int(kmessage, kp); + if (cds_is_driver_loaded() || cds_is_load_or_unload_in_progress()) { + pr_err("Driver already loaded or load/unload in progress"); + return -ENOTSUPP; + } + if (con_mode_ftm != QDF_GLOBAL_FTM_MODE) { pr_err("Only FTM mode supported!"); return -ENOTSUPP; From 1e1fac45ea59699edee6cc5d41305478b04a7d65 Mon Sep 17 00:00:00 2001 From: Madan Koyyalamudi Date: Tue, 27 Dec 2022 04:58:20 -0800 Subject: [PATCH 7/7] Release 2.0.8.31Z Release 2.0.8.31Z Change-Id: I35f76c62c9edc63bcd716968f05a48a46eb4fc43 CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index e0d09f298e35..9f2b6e7dd645 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "Y" +#define QWLAN_VERSION_EXTRA "Z" #define QWLAN_VERSION_BUILD 31 -#define QWLAN_VERSIONSTR "2.0.8.31Y" +#define QWLAN_VERSIONSTR "2.0.8.31Z" #endif /* QWLAN_VERSION_H */