Merge 68285abdca7f12210ec600943a2564d434c91d78 on remote branch (4e15799e) · Commits · e / devices / android_kernel_fairphone_FP5

components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.		* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
			* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
	*		*
	* Permission to use, copy, modify, and/or distribute this software for		* Permission to use, copy, modify, and/or distribute this software for
	* any purpose with or without fee is hereby granted, provided that the		* any purpose with or without fee is hereby granted, provided that the
	@@ -299,7 +300,6 @@ tgt_mc_cp_stats_prepare_raw_peer_rssi(struct wlan_objmgr_psoc *psoc,
	}		}

	end:		end:
	if (ev.peer_stats)
	get_peer_rssi_cb(&ev, last_req->cookie);		get_peer_rssi_cb(&ev, last_req->cookie);

	ucfg_mc_cp_stats_free_stats_resources(&ev);		ucfg_mc_cp_stats_free_stats_resources(&ev);

components/mlme/dispatcher/inc/wlan_mlme_api.h

+13 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.		* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
	* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.		* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
	*		*
	* Permission to use, copy, modify, and/or distribute this software for		* Permission to use, copy, modify, and/or distribute this software for
	* any purpose with or without fee is hereby granted, provided that the		* any purpose with or without fee is hereby granted, provided that the
	@@ -3221,4 +3221,16 @@ QDF_STATUS
	wlan_mlme_get_tx_retry_multiplier(struct wlan_objmgr_psoc *psoc,		wlan_mlme_get_tx_retry_multiplier(struct wlan_objmgr_psoc *psoc,
	uint32_t *tx_retry_multiplier);		uint32_t *tx_retry_multiplier);

			/**
			* wlan_mlme_get_channel_bonding_5ghz - Get the channel bonding
			* val for 5ghz freq
			* @psoc: pointer to psoc object
			* @value: pointer to the value which will be filled for the caller
			*
			* Return: QDF Status
			*/
			QDF_STATUS
			wlan_mlme_get_channel_bonding_5ghz(struct wlan_objmgr_psoc *psoc,
			uint32_t *value);

	#endif /* _WLAN_MLME_API_H_ */		#endif /* _WLAN_MLME_API_H_ */

components/mlme/dispatcher/src/wlan_mlme_api.c

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4990,3 +4990,19 @@ wlan_mlme_get_tx_retry_multiplier(struct wlan_objmgr_psoc *psoc,
	*tx_retry_multiplier = mlme_obj->cfg.gen.tx_retry_multiplier;		*tx_retry_multiplier = mlme_obj->cfg.gen.tx_retry_multiplier;
	return QDF_STATUS_SUCCESS;		return QDF_STATUS_SUCCESS;
	}		}

			QDF_STATUS
			wlan_mlme_get_channel_bonding_5ghz(struct wlan_objmgr_psoc *psoc,
			uint32_t *value)
			{
			struct wlan_mlme_psoc_ext_obj *mlme_obj;

			mlme_obj = mlme_get_psoc_ext_obj(psoc);
			if (!mlme_obj) {
			*value = cfg_default(CFG_CHANNEL_BONDING_MODE_5GHZ);
			return QDF_STATUS_E_INVAL;
			}

			*value = mlme_obj->cfg.feature_flags.channel_bonding_mode_5ghz;
			return QDF_STATUS_SUCCESS;
			}

components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1642,16 +1642,7 @@ QDF_STATUS
	ucfg_mlme_get_channel_bonding_5ghz(struct wlan_objmgr_psoc *psoc,		ucfg_mlme_get_channel_bonding_5ghz(struct wlan_objmgr_psoc *psoc,
	uint32_t *value)		uint32_t *value)
	{		{
	struct wlan_mlme_psoc_ext_obj *mlme_obj;		return wlan_mlme_get_channel_bonding_5ghz(psoc, value);

	mlme_obj = mlme_get_psoc_ext_obj(psoc);
	if (!mlme_obj) {
	*value = cfg_default(CFG_CHANNEL_BONDING_MODE_5GHZ);
	return QDF_STATUS_E_INVAL;
	}
	*value = mlme_obj->cfg.feature_flags.channel_bonding_mode_5ghz;

	return QDF_STATUS_SUCCESS;
	}		}

	QDF_STATUS		QDF_STATUS

components/pkt_capture/core/src/wlan_pkt_capture_data_txrx.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.		* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
	* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.		* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
	*		*
	* Permission to use, copy, modify, and/or distribute this software for		* Permission to use, copy, modify, and/or distribute this software for
	* any purpose with or without fee is hereby granted, provided that the		* any purpose with or without fee is hereby granted, provided that the
	@@ -299,9 +299,10 @@ pkt_capture_update_tx_status(
	pktcapture_hdr->nss = vdev_priv->tx_nss;		pktcapture_hdr->nss = vdev_priv->tx_nss;

	/* Remove the ppdu stats from front of list and fill it in tx_status */		/* Remove the ppdu stats from front of list and fill it in tx_status */
	qdf_spin_lock(&vdev_priv->lock_q);		qdf_spin_lock_bh(&vdev_priv->lock_q);
	if (QDF_STATUS_SUCCESS ==		if (QDF_STATUS_SUCCESS ==
	qdf_list_remove_front(&vdev_priv->ppdu_stats_q, &node)) {		qdf_list_remove_front(&vdev_priv->ppdu_stats_q, &node)) {
			qdf_spin_unlock_bh(&vdev_priv->lock_q);
	q_node = qdf_container_of(		q_node = qdf_container_of(
	node, struct pkt_capture_ppdu_stats_q_node, node);		node, struct pkt_capture_ppdu_stats_q_node, node);
	smu = (htt_ppdu_stats_for_smu_tlv *)(q_node->buf);		smu = (htt_ppdu_stats_for_smu_tlv *)(q_node->buf);
	@@ -317,8 +318,9 @@ pkt_capture_update_tx_status(
	2 * sizeof(uint32_t));		2 * sizeof(uint32_t));

	qdf_mem_free(q_node);		qdf_mem_free(q_node);
			} else {
			qdf_spin_unlock_bh(&vdev_priv->lock_q);
	}		}
	qdf_spin_unlock(&vdev_priv->lock_q);

	skip_ppdu_stats:		skip_ppdu_stats:
	pkt_capture_tx_get_phy_info(pktcapture_hdr, tx_status);		pkt_capture_tx_get_phy_info(pktcapture_hdr, tx_status);