Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d9c4f23b authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0' of... 

Merge tag 'LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 into android13-5.4-lahaina

"LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0"

* tag 'LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0:
  Release 2.0.8.34N
  qcacld-3.0: Reset roaming_in_progress upon VDEV down

Change-Id: I5a55a8b81c7c182b1798e57acc7e8b26137e5aa0
parents adb424d0 1dc26c68

drivers/staging/qcacld-3.0/core/mac/inc/qwlan_version.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#define QWLAN_VERSION_MAJOR            2

#define QWLAN_VERSION_MINOR            0

#define QWLAN_VERSION_PATCH            8

#define QWLAN_VERSION_EXTRA            "M"

#define QWLAN_VERSION_EXTRA            "N"

#define QWLAN_VERSION_BUILD            34



#define QWLAN_VERSIONSTR               "2.0.8.34M"

#define QWLAN_VERSIONSTR               "2.0.8.34N"



#endif /* QWLAN_VERSION_H */

drivers/staging/qcacld-3.0/core/wma/src/wma_dev_if.c

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-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
@@ -2214,6 +2214,9 @@ void wma_send_vdev_down(tp_wma_handle wma, struct del_bss_resp *resp) 
		return;

	}



	wma_debug("Reset roaming_in_progress for vdev %d", vdev_id);

	wma->interfaces[vdev_id].roaming_in_progress = false;



	if (vdev_stop_type != WMA_DELETE_BSS_HO_FAIL_REQ) {

		if (wma_send_vdev_down_to_fw(wma, vdev_id) !=

		    QDF_STATUS_SUCCESS)

drivers/staging/qcacld-3.0/core/wma/src/wma_utils.c

+1 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-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
@@ -3959,8 +3959,6 @@ QDF_STATUS wma_send_vdev_down_to_fw(t_wma_handle *wma, uint8_t vdev_id) 
		return status;

	}



	wma->interfaces[vdev_id].roaming_in_progress = false;



	status = vdev_mgr_down_send(vdev_mlme);



	return status;