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

Commit a00555d8 authored Oct 12, 2022 by Linux Build Service Account

Merge 0e307776 on remote branch

Change-Id: I64b9066a0cee51faca5c1038be3f076918a2764c

parents 8aaf956f 0e307776

dp/inc/cdp_txrx_cmn_struct.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2231,6 +2231,8 @@ struct cdp_monitor_filter {
	* @cfg_dp_tso_enable: get TSO enable config		* @cfg_dp_tso_enable: get TSO enable config
	* @cfg_dp_lro_enable: get LRO enable config		* @cfg_dp_lro_enable: get LRO enable config
	* @cfg_dp_gro_enable: get GRP enable config		* @cfg_dp_gro_enable: get GRP enable config
			* @cfg_dp_tc_based_dyn_gro_enable: get TC based dynamic gro enable config
			* @cfg_dp_tc_ingress_prio: priority value to be checked for tc filters
	* @cfg_dp_tx_flow_start_queue_offset: get DP TX flow start queue offset		* @cfg_dp_tx_flow_start_queue_offset: get DP TX flow start queue offset
	* @cfg_dp_tx_flow_stop_queue_threshold: get DP TX flow stop queue threshold		* @cfg_dp_tx_flow_stop_queue_threshold: get DP TX flow stop queue threshold
	* @cfg_dp_ipa_uc_tx_buf_size: get IPA TX buf size config		* @cfg_dp_ipa_uc_tx_buf_size: get IPA TX buf size config
	@@ -2254,6 +2256,8 @@ enum cdp_dp_cfg {
	cfg_dp_lro_enable,		cfg_dp_lro_enable,
	cfg_dp_gro_enable,		cfg_dp_gro_enable,
	cfg_dp_sg_enable,		cfg_dp_sg_enable,
			cfg_dp_tc_based_dyn_gro_enable,
			cfg_dp_tc_ingress_prio,
	cfg_dp_tx_flow_start_queue_offset,		cfg_dp_tx_flow_start_queue_offset,
	cfg_dp_tx_flow_stop_queue_threshold,		cfg_dp_tx_flow_stop_queue_threshold,
	cfg_dp_ipa_uc_tx_buf_size,		cfg_dp_ipa_uc_tx_buf_size,

dp/inc/cdp_txrx_mob_def.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.		* Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
			* Copyright (c) 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
	@@ -312,6 +313,8 @@ struct txrx_pdev_cfg_param_t {

	struct ol_tx_sched_wrr_ac_specs_t ac_specs[TX_WMM_AC_NUM];		struct ol_tx_sched_wrr_ac_specs_t ac_specs[TX_WMM_AC_NUM];
	bool gro_enable;		bool gro_enable;
			bool tc_based_dyn_gro;
			uint32_t tc_ingress_prio;
	bool tso_enable;		bool tso_enable;
	bool lro_enable;		bool lro_enable;
	bool sg_enable;		bool sg_enable;

dp/wifi3.0/dp_main.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10178,6 +10178,12 @@ static uint32_t dp_get_cfg(struct cdp_soc_t *soc, enum cdp_dp_cfg cfg)
	case cfg_dp_sg_enable:		case cfg_dp_sg_enable:
	value = dpsoc->wlan_cfg_ctx->sg_enabled;		value = dpsoc->wlan_cfg_ctx->sg_enabled;
	break;		break;
			case cfg_dp_tc_based_dyn_gro_enable:
			value = dpsoc->wlan_cfg_ctx->tc_based_dynamic_gro;
			break;
			case cfg_dp_tc_ingress_prio:
			value = dpsoc->wlan_cfg_ctx->tc_ingress_prio;
			break;
	case cfg_dp_tx_flow_start_queue_offset:		case cfg_dp_tx_flow_start_queue_offset:
	value = dpsoc->wlan_cfg_ctx->tx_flow_start_queue_offset;		value = dpsoc->wlan_cfg_ctx->tx_flow_start_queue_offset;
	break;		break;

dp/wifi3.0/dp_stats.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.		* Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.
			* Copyright (c) 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
	@@ -4677,6 +4678,10 @@ void dp_print_soc_cfg_params(struct dp_soc *soc)
	soc_cfg_ctx->sg_enabled);		soc_cfg_ctx->sg_enabled);
	DP_PRINT_STATS("Gro enabled: %u ",		DP_PRINT_STATS("Gro enabled: %u ",
	soc_cfg_ctx->gro_enabled);		soc_cfg_ctx->gro_enabled);
			DP_PRINT_STATS("TC based dynamic GRO: %u ",
			soc_cfg_ctx->tc_based_dynamic_gro);
			DP_PRINT_STATS("TC ingress prio: %u ",
			soc_cfg_ctx->tc_ingress_prio);
	DP_PRINT_STATS("rawmode enabled: %u ",		DP_PRINT_STATS("rawmode enabled: %u ",
	soc_cfg_ctx->rawmode_enabled);		soc_cfg_ctx->rawmode_enabled);
	DP_PRINT_STATS("peer flow ctrl enabled: %u ",		DP_PRINT_STATS("peer flow ctrl enabled: %u ",

umac/regulatory/core/src/reg_services_common.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3333,7 +3333,8 @@ static void reg_set_2g_channel_params_for_freq(struct wlan_objmgr_pdev *pdev,
	reg_get_2g_bonded_channel_state_for_freq(pdev, oper_freq,		reg_get_2g_bonded_channel_state_for_freq(pdev, oper_freq,
	sec_ch_2g_freq,		sec_ch_2g_freq,
	ch_params->ch_width);		ch_params->ch_width);
	if (chan_state == CHANNEL_STATE_ENABLE) {		if ((chan_state == CHANNEL_STATE_ENABLE) \|\|
			(chan_state == CHANNEL_STATE_DFS)) {
	if (ch_params->ch_width == CH_WIDTH_40MHZ) {		if (ch_params->ch_width == CH_WIDTH_40MHZ) {
	if (oper_freq < sec_ch_2g_freq)		if (oper_freq < sec_ch_2g_freq)
	ch_params->sec_ch_offset =		ch_params->sec_ch_offset =