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

Commit 3ecb182f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge cf849384 on remote branch 

Change-Id: I51aa2c4c6b6eeaf7cb67a150cc824e94df3fe004
parents 97f8ed15 cf849384

os_if/linux/scan/src/wlan_cfg80211_scan.c

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

 * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 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
@@ -1679,8 +1680,10 @@ QDF_STATUS wlan_abort_scan(struct wlan_objmgr_pdev *pdev, 
	req->cancel_req.scan_id = scan_id;

	req->cancel_req.pdev_id = pdev_id;

	req->cancel_req.vdev_id = vdev_id;

	if (scan_id != INVAL_SCAN_ID)

	if (scan_id != INVAL_SCAN_ID && scan_id != CANCEL_HOST_SCAN_ID)

		req->cancel_req.req_type = WLAN_SCAN_CANCEL_SINGLE;

	else if (scan_id == CANCEL_HOST_SCAN_ID)

		req->cancel_req.req_type = WLAN_SCAN_CANCEL_HOST_VDEV_ALL;

	else if (vdev_id == INVAL_VDEV_ID)

		req->cancel_req.req_type = WLAN_SCAN_CANCEL_PDEV_ALL;

	else

umac/cmn_services/serialization/inc/wlan_serialization_api.h

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

 * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 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
@@ -203,6 +204,7 @@ enum wlan_serialization_cmd_type { 
 * @WLAN_SER_CANCEL_SINGLE_SCAN: Cancel a single scan with a given ID

 * @WLAN_SER_CANCEL_PDEV_SCANS: Cancel all the scans on a given pdev

 * @WLAN_SER_CANCEL_VDEV_SCANS: Cancel all the scans on given vdev

 * @WLAN_SER_CANCEL_VDEV_HOST_SCANS: Cancel all host scans on given vdev

 * @WLAN_SER_CANCEL_PDEV_NON_SCAN_CMD: Cancel all non scans on a given pdev

 * @WLAN_SER_CANCEL_VDEV_NON_SCAN_CMD: Cancel all non scans on a given vdev

 * @WLAN_SER_CANCEL_VDEV_NON_SCAN_CMD_TYPE: Cancel all non scans on a given vdev
@@ -213,6 +215,7 @@ enum wlan_serialization_cancel_type { 
	WLAN_SER_CANCEL_SINGLE_SCAN,

	WLAN_SER_CANCEL_PDEV_SCANS,

	WLAN_SER_CANCEL_VDEV_SCANS,

	WLAN_SER_CANCEL_VDEV_HOST_SCANS,

	WLAN_SER_CANCEL_PDEV_NON_SCAN_CMD,

	WLAN_SER_CANCEL_VDEV_NON_SCAN_CMD,

	WLAN_SER_CANCEL_VDEV_NON_SCAN_CMD_TYPE,

umac/cmn_services/serialization/src/wlan_serialization_internal.c

+2 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 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
@@ -902,6 +903,7 @@ wlan_serialization_find_and_cancel_cmd( 
				WLAN_SER_CMD_SCAN, queue_type);

		break;

	case WLAN_SER_CANCEL_VDEV_SCANS:

	case WLAN_SER_CANCEL_VDEV_HOST_SCANS:

		/* remove all scan cmds which matches the vdev object */

		status = wlan_serialization_cmd_cancel_handler(

				ser_obj, NULL, NULL, cmd->vdev,

umac/scan/core/src/wlan_scan_manager.c

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

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 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
@@ -1185,6 +1186,9 @@ get_serialization_cancel_type(enum scan_cancel_req_type type) 
	case WLAN_SCAN_CANCEL_PDEV_ALL:

		serialization_type = WLAN_SER_CANCEL_PDEV_SCANS;

		break;

	case WLAN_SCAN_CANCEL_HOST_VDEV_ALL:

		serialization_type = WLAN_SER_CANCEL_VDEV_HOST_SCANS;

		break;

	default:

		QDF_ASSERT(0);

		scm_warn("invalid scan_cancel_req_type: %d", type);

umac/scan/dispatcher/inc/wlan_scan_public_structs.h

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

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 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
@@ -40,6 +41,7 @@ typedef uint32_t wlan_scan_id; 
#define SCM_CANCEL_SCAN_WAIT_ITERATION 600



#define INVAL_SCAN_ID        0xFFFFFFFF

#define CANCEL_HOST_SCAN_ID  0xFFFFFFFE

#define INVAL_VDEV_ID        0xFFFFFFFF

#define INVAL_PDEV_ID        0xFFFFFFFF
@@ -976,12 +978,15 @@ struct scan_start_request { 
 * enum scan_cancel_type - type specifiers for cancel scan request

 * @WLAN_SCAN_CANCEL_SINGLE: cancel particular scan specified by scan_id

 * @WLAN_SCAN_CANCEL_VAP_ALL: cancel all scans running on a particular vdevid

 * WLAN_SCAN_CANCEL_PDEV_ALL: cancel all scans running on parent pdev of vdevid

 * @WLAN_SCAN_CANCEL_PDEV_ALL: cancel all scans running on parent pdev of vdevid

 * @WLAN_SCAN_CANCEL_HOST_VDEV_ALL: Cancel all host triggered scans alone on

 * vdev

 */

enum scan_cancel_req_type {

	WLAN_SCAN_CANCEL_SINGLE = 1,

	WLAN_SCAN_CANCEL_VDEV_ALL,

	WLAN_SCAN_CANCEL_PDEV_ALL,

	WLAN_SCAN_CANCEL_HOST_VDEV_ALL,

};



/**