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; 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 */