From ecb72b8f9b190168668b903aa094819a92b5178d Mon Sep 17 00:00:00 2001 From: Surya Prakash Sivaraj Date: Mon, 4 Mar 2024 17:25:58 +0530 Subject: [PATCH 1/2] qcacld-3.0: Return vendor abort status to userspace Host completes scan, however due to memory allocation failure, driver cannot send the scan completed event to the userspace. After timeout, supplicant sends vendor scan abort to the driver. However, driver doesn't send the failure status(because driver doesn't have any active scan to abort). Since, the status code is sent as 0, supplicant keeps waiting for the scan completed status event from host. Send the vendor abort failure reason to the userspace, so that the supplicant can clear out scan-in-progress flag. Change-Id: I771b7d3d76c7d7aea58ac3d02665bd43da00e222 CRs-Fixed: 3707469 --- core/hdd/src/wlan_hdd_scan.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 7c69a2412d04..87678f34c27a 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022,2024 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 @@ -1226,9 +1226,8 @@ static int __wlan_hdd_vendor_abort_scan( if (0 != ret) return ret; - wlan_vendor_abort_scan(hdd_ctx->pdev, data, data_len); + return wlan_vendor_abort_scan(hdd_ctx->pdev, data, data_len); - return ret; } /** @@ -1249,6 +1248,8 @@ int wlan_hdd_vendor_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev, struct osif_vdev_sync *vdev_sync; int errno; + hdd_enter_dev(wdev->netdev); + errno = osif_vdev_sync_op_start(wdev->netdev, &vdev_sync); if (errno) return errno; From e3e8d39bc9aac94d28e7165fcb2621e39da06286 Mon Sep 17 00:00:00 2001 From: Ravindra Konda Date: Wed, 13 Mar 2024 01:07:39 -0700 Subject: [PATCH 2/2] Release 2.0.8.34O Release 2.0.8.34O Change-Id: Idb551df84423b1a981d0270a4c988410d5a9aaff 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 10471b7d5459..ad5a1f1be5f4 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 "N" +#define QWLAN_VERSION_EXTRA "O" #define QWLAN_VERSION_BUILD 34 -#define QWLAN_VERSIONSTR "2.0.8.34N" +#define QWLAN_VERSIONSTR "2.0.8.34O" #endif /* QWLAN_VERSION_H */