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

Commit 46c112ab authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 330f66f9 on remote branch 

Change-Id: I03ef7c30471e26eb1016898b251c0633492345e7
parents b32d5004 330f66f9

components/fw_offload/dispatcher/src/wlan_fwol_tgt_api.c

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ QDF_STATUS tgt_fwol_pdev_param_send(struct wlan_objmgr_pdev *pdev, 
{

	struct wmi_unified *wmi_handle = get_wmi_unified_hdl_from_pdev(pdev);



	if (!wmi_handle)

		return QDF_STATUS_E_FAILURE;



	return wmi_unified_pdev_param_send(wmi_handle, &pdev_param,

					   FWOL_WILDCARD_PDEV_ID);

}

components/ipa/core/src/wlan_ipa_stats.c

+3 −4
Original line number Diff line number Diff line
@@ -965,7 +965,6 @@ QDF_STATUS wlan_ipa_uc_op_metering(struct wlan_ipa_priv *ipa_ctx, 
	struct ipa_uc_quota_rsp *uc_quota_rsp;

	struct ipa_uc_quota_ind *uc_quota_ind;

	struct wlan_ipa_iface_context *iface_ctx;

	uint32_t ifindex;

	uint64_t quota_bytes;



	if (msg->op_code == WLAN_IPA_UC_OPCODE_SHARING_STATS) {
@@ -996,10 +995,10 @@ QDF_STATUS wlan_ipa_uc_op_metering(struct wlan_ipa_priv *ipa_ctx, 


		/* send quota exceeded indication to IPA */

		iface_ctx = wlan_ipa_get_iface(ipa_ctx, QDF_STA_MODE);

		ifindex = iface_ctx->dev->ifindex;

		quota_bytes = uc_quota_ind->quota_bytes;

		if (iface_ctx)

			qdf_ipa_broadcast_wdi_quota_reach_ind(ifindex,

			qdf_ipa_broadcast_wdi_quota_reach_ind(

							iface_ctx->dev->ifindex,

							quota_bytes);

		else

			ipa_err("Failed quota_reach_ind: NULL interface");

core/dp/txrx/ol_txrx_ipa.c

+8 −3
Original line number Diff line number Diff line
@@ -644,14 +644,19 @@ QDF_STATUS ol_txrx_ipa_cleanup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, 
	struct ol_txrx_ipa_resources *ipa_res;

	struct ol_txrx_soc_t *soc = cds_get_context(QDF_MODULE_ID_SOC);

	qdf_device_t osdev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);

	ol_txrx_pdev_handle pdev =

		ol_txrx_get_pdev_from_pdev_id(soc, OL_TXRX_PDEV_ID);

	ol_txrx_pdev_handle pdev;



	if (!pdev || !osdev) {

	if (!soc || !osdev) {

		ol_txrx_err("%s invalid instance", __func__);

		return QDF_STATUS_E_FAILURE;

	}



	pdev = ol_txrx_get_pdev_from_pdev_id(soc, OL_TXRX_PDEV_ID);

	if (!pdev) {

		ol_txrx_err("%s NULL pdev invalid instance", __func__);

		return QDF_STATUS_E_FAILURE;

	}



	ipa_res = &pdev->ipa_resource;

	if (osdev->smmu_s1_enabled) {

		ret = pld_smmu_unmap(osdev->dev,

core/hdd/inc/wlan_hdd_tx_rx.h

+8 −1
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
@@ -428,7 +428,14 @@ void hdd_reset_tcp_delack(struct hdd_context *hdd_ctx); 
 * Return: None

 */

void hdd_reset_tcp_adv_win_scale(struct hdd_context *hdd_ctx);

#ifdef RX_PERFORMANCE

bool hdd_is_current_high_throughput(struct hdd_context *hdd_ctx);

#else

static inline bool hdd_is_current_high_throughput(struct hdd_context *hdd_ctx)

{

	return false;

}

#endif

#define HDD_MSM_CFG(msm_cfg)	msm_cfg

#else

static inline void hdd_reset_tcp_delack(struct hdd_context *hdd_ctx) {}

core/hdd/src/wlan_hdd_tx_rx.c

+2 −0
Original line number Diff line number Diff line
@@ -3312,6 +3312,7 @@ void hdd_reset_tcp_adv_win_scale(struct hdd_context *hdd_ctx) 
 *

 * Return: True if vote level is high

 */

#ifdef RX_PERFORMANCE

bool hdd_is_current_high_throughput(struct hdd_context *hdd_ctx)

{

	if (hdd_ctx->cur_vote_level < PLD_BUS_WIDTH_MEDIUM)
@@ -3320,6 +3321,7 @@ bool hdd_is_current_high_throughput(struct hdd_context *hdd_ctx) 
		return true;

}

#endif

#endif



#ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL

/**