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

Commit 377329f3 authored by Yu Wang's avatar Yu Wang Committed by Lin Bai
Browse files

qcacld-3.0: remove delay_before_vdev_stop from wma_txrx_node 

The delay before vdev stop is a global config,
no need to set for each interface separately.

Change-Id: I5760cf083a6749bb82cc88635a947f1d18308dfe
CRs-Fixed: 2904748
parent 14a28c71

core/wma/inc/wma.h

+0 −2
Original line number Diff line number Diff line
@@ -716,7 +716,6 @@ struct wma_invalid_peer_params { 
 * @roam_synch_in_progress: flag is in progress or not

 * @plink_status_req: link status request

 * @psnr_req: snr request

 * @delay_before_vdev_stop: delay

 * @tx_streams: number of tx streams can be used by the vdev

 * @mac_id: the mac on which vdev is on

 * @wep_default_key_idx: wep default index for group key
@@ -766,7 +765,6 @@ struct wma_txrx_node { 
	bool roam_synch_in_progress;

	void *plink_status_req;

	void *psnr_req;

	uint8_t delay_before_vdev_stop;

#ifdef FEATURE_WLAN_EXTSCAN

	bool extscan_in_progress;

#endif

core/wma/src/wma_dev_if.c

+7 −4
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#include "wlan_mlme_public_struct.h"

#include "wlan_mlme_api.h"

#include "wlan_mlme_main.h"

#include "wlan_mlme_ucfg_api.h"

#include <wlan_dfs_utils_api.h>

#include "../../core/src/vdev_mgr_ops.h"

#include "wlan_utility.h"
@@ -4868,9 +4869,10 @@ void wma_delete_bss_ho_fail(tp_wma_handle wma, uint8_t vdev_id) 
static void wma_wait_tx_complete(tp_wma_handle wma,

				uint32_t session_id)

{

	uint8_t max_wait_iterations = 0;

	uint8_t max_wait_iterations = 0, delay = 0;

	cdp_config_param_type val;

	void *soc = cds_get_context(QDF_MODULE_ID_SOC);

	QDF_STATUS status;



	if (!wma_is_vdev_valid(session_id)) {

		WMA_LOGE("%s: Vdev is not valid: %d",
@@ -4878,10 +4880,11 @@ static void wma_wait_tx_complete(tp_wma_handle wma, 
		return;

	}



	max_wait_iterations =

		wma->interfaces[session_id].delay_before_vdev_stop /

		WMA_TX_Q_RECHECK_TIMER_WAIT;

	status = ucfg_mlme_get_delay_before_vdev_stop(wma->psoc, &delay);

	if (QDF_IS_STATUS_ERROR(status))

		wma_err("Failed to get delay before vdev stop");



	max_wait_iterations = delay / WMA_TX_Q_RECHECK_TIMER_WAIT;

	if (cdp_txrx_get_pdev_param(soc,

				    wlan_objmgr_pdev_get_pdev_id(wma->pdev),

				    CDP_TX_PENDING, &val))

core/wma/src/wma_main.c

+2 −7
Original line number Diff line number Diff line
@@ -2867,7 +2867,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc, 
	bool val = 0;

	void *cds_context;

	target_resource_config *wlan_res_cfg;

	uint8_t delay_before_vdev_stop;

	uint32_t self_gen_frm_pwr = 0;



	WMA_LOGD("%s: Enter", __func__);
@@ -3042,13 +3041,9 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc, 
		goto err_scn_context;

	}



	for (i = 0; i < wma_handle->max_bssid; ++i) {

	for (i = 0; i < wma_handle->max_bssid; ++i)

		wma_vdev_init(&wma_handle->interfaces[i]);

		ucfg_mlme_get_delay_before_vdev_stop(wma_handle->psoc,

						     &delay_before_vdev_stop);

		wma_handle->interfaces[i].delay_before_vdev_stop =

							delay_before_vdev_stop;

	}



	/* Register the debug print event handler */

	wmi_unified_register_event_handler(wma_handle->wmi_handle,

					wmi_debug_print_event_id,

core/wma/src/wma_scan_roam.c

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

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

 * Copyright (c) 2013-2021 The Linux Foundation. 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
@@ -1847,7 +1847,6 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, 
	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);

	uint32_t mode = 0;

	uint8_t enable_roam_reason_vsie = 0;

	struct wma_txrx_node *intr = NULL;

	struct wmi_bss_load_config *bss_load_cfg;



	if (!mac) {
@@ -1864,8 +1863,6 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, 
	wma_handle->interfaces[roam_req->sessionId].roaming_in_progress = false;

	switch (roam_req->Command) {

	case ROAM_SCAN_OFFLOAD_START:

		intr = &wma_handle->interfaces[roam_req->sessionId];

		intr->delay_before_vdev_stop = roam_req->delay_before_vdev_stop;

		/*

		 * Scan/Roam threshold parameters are translated from

		 * fields of struct roam_offload_scan_req to WMITLV