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

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

Merge 796e14de on remote branch 

Change-Id: Icf4bce5d32393073ee6fa46156443ecf1143d6cd
parents 1962115d 796e14de

dp/inc/cdp_txrx_cmn_struct.h

+4 −2
Original line number Diff line number Diff line
@@ -2333,7 +2333,8 @@ struct cdp_monitor_filter { 
 * @cfg_dp_tso_enable: get TSO enable config

 * @cfg_dp_lro_enable: get LRO enable config

 * @cfg_dp_gro_enable: get GRP enable config

 * @cfg_dp_force_gro_enable: get Force 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_stop_queue_threshold: get DP TX flow stop queue threshold

 * @cfg_dp_ipa_uc_tx_buf_size: get IPA TX buf size config
@@ -2356,7 +2357,8 @@ enum cdp_dp_cfg { 
	cfg_dp_tso_enable,

	cfg_dp_lro_enable,

	cfg_dp_gro_enable,

	cfg_dp_force_gro_enable,

	cfg_dp_tc_based_dyn_gro_enable,

	cfg_dp_tc_ingress_prio,

	cfg_dp_tx_flow_start_queue_offset,

	cfg_dp_tx_flow_stop_queue_threshold,

	cfg_dp_ipa_uc_tx_buf_size,

dp/wifi3.0/dp_main.c

+15 −3
Original line number Diff line number Diff line
@@ -2691,7 +2691,8 @@ static void dp_soc_interrupt_detach(struct cdp_soc_t *txrx_soc) 
	}



	qdf_mem_set(&soc->mon_intr_id_lmac_map,

		    REG_BAND_UNKNOWN * sizeof(int), DP_MON_INVALID_LMAC_ID);

		    sizeof(soc->mon_intr_id_lmac_map),

		    DP_MON_INVALID_LMAC_ID);

}



#define AVG_MAX_MPDUS_PER_TID 128
@@ -9025,6 +9026,14 @@ static QDF_STATUS dp_get_pdev_param(struct cdp_soc_t *cdp_soc, uint8_t pdev_id, 
		val->cdp_pdev_param_fltr_ucast =

					dp_pdev_get_filter_ucast_data(pdev);

		break;

	case CDP_MONITOR_CHANNEL:

		val->cdp_pdev_param_monitor_chan =

			((struct dp_pdev *)pdev)->mon_chan_num;

		break;

	case CDP_MONITOR_FREQUENCY:

		val->cdp_pdev_param_mon_freq =

			((struct dp_pdev *)pdev)->mon_chan_freq;

		break;

	default:

		return QDF_STATUS_E_FAILURE;

	}
@@ -11113,8 +11122,11 @@ static uint32_t dp_get_cfg(struct cdp_soc_t *soc, enum cdp_dp_cfg cfg) 
	case cfg_dp_gro_enable:

		value = dpsoc->wlan_cfg_ctx->gro_enabled;

		break;

	case cfg_dp_force_gro_enable:

		value = dpsoc->wlan_cfg_ctx->force_gro_enabled;

	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:

		value = dpsoc->wlan_cfg_ctx->tx_flow_start_queue_offset;

dp/wifi3.0/dp_stats.c

+4 −2
Original line number Diff line number Diff line
@@ -4917,8 +4917,10 @@ void dp_print_soc_cfg_params(struct dp_soc *soc) 
		       soc_cfg_ctx->sg_enabled);

	DP_PRINT_STATS("Gro enabled: %u ",

		       soc_cfg_ctx->gro_enabled);

	DP_PRINT_STATS("Force Gro enabled: %u ",

		       soc_cfg_ctx->force_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 ",

		       soc_cfg_ctx->rawmode_enabled);

	DP_PRINT_STATS("peer flow ctrl enabled: %u ",

hif/src/ce/ce_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3163,7 +3163,7 @@ static void hif_update_rri_over_ddr_config(struct hif_softc *scn, 
 */

int hif_wlan_enable(struct hif_softc *scn)

{

	struct pld_wlan_enable_cfg cfg;

	struct pld_wlan_enable_cfg cfg = { 0 };

	enum pld_driver_mode mode;

	uint32_t con_mode = hif_get_conparam(scn);

umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h

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

 * 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

 * any purpose with or without fee is hereby granted, provided that the
@@ -196,6 +197,10 @@ 
/* 80 + 80 MHz Operating Channel  (revised signalling) */

#define WLAN_VHTOP_CHWIDTH_REVSIG_80_80  1



#define WLAN_MAX_HEOP_IE_LEN              16

#define WLAN_HEOP_OUI_TYPE                "\x24"

#define WLAN_HEOP_OUI_SIZE                1



#define WLAN_HEOP_FIXED_PARAM_LENGTH       7

#define WLAN_HEOP_VHTOP_LENGTH             3

#define WLAN_HEOP_CO_LOCATED_BSS_LENGTH    1