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

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

Merge 762d3e1a on remote branch 

Change-Id: Ia612cf1e9a0a7868d5fb8d72a066332435505dfb
parents 85849b03 762d3e1a

Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -2369,7 +2369,7 @@ cppflags-$(CONFIG_PLD_PCIE_INIT_FLAG) += -DCONFIG_PLD_PCIE_INIT 
cppflags-$(CONFIG_WLAN_FEATURE_DP_RX_THREADS) += -DFEATURE_WLAN_DP_RX_THREADS

cppflags-$(CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT) += -DWLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT

cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE) += -DFEATURE_HAL_DELAYED_REG_WRITE



cppflags-$(CONFIG_SHADOW_WRITE_DELAY) += -DSHADOW_WRITE_DELAY



cppflags-$(CONFIG_PLD_USB_CNSS) += -DCONFIG_PLD_USB_CNSS

cppflags-$(CONFIG_PLD_SDIO_CNSS2) += -DCONFIG_PLD_SDIO_CNSS2

components/p2p/core/src/wlan_p2p_roc.c

+2 −3
Original line number Diff line number Diff line
@@ -167,9 +167,8 @@ static QDF_STATUS p2p_scan_start(struct p2p_roc_context *roc_ctx) 
				P2P_MAX_ROC_DURATION_NON_DBS_NAN_PRESENT)

					req->scan_req.dwell_time_passive =

						P2P_MAX_ROC_DURATION_NON_DBS_NAN_PRESENT;



		else if (req->scan_req.dwell_time_passive >

			P2P_MAX_ROC_DURATION)

		} else if (req->scan_req.dwell_time_passive >

			P2P_MAX_ROC_DURATION) {

			req->scan_req.dwell_time_passive = P2P_MAX_ROC_DURATION;

		}

	}

configs/default_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -429,6 +429,9 @@ CONFIG_VERBOSE_DEBUG := y 
CONFIG_RX_DESC_SANITY_WAR := y

ifeq ($(CONFIG_PCI_MSM), y)

	CONFIG_FEATURE_HAL_DELAYED_REG_WRITE := y

ifeq ($(CONFIG_CNSS_QCA6390), y)

	CONFIG_SHADOW_WRITE_DELAY := y

endif

endif

endif

core/dp/txrx/ol_txrx_ipa.c

+1 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ QDF_STATUS ol_txrx_ipa_setup_iface(char *ifname, uint8_t *mac_addr, 
		  "%s: Add Partial hdr: %s, "QDF_MAC_ADDR_FMT,

		  __func__, ifname, QDF_MAC_ADDR_REF(mac_addr));



	qdf_mem_zero(&in, sizeof(qdf_ipa_wdi_reg_intf_in_params_t));

	qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));

	memcpy(&uc_tx_hdr, &ipa_uc_tx_hdr, OL_TXRX_IPA_UC_WLAN_TX_HDR_LEN);

	qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);

core/dp/txrx3.0/dp_fisa_rx.c

+4 −3
Original line number Diff line number Diff line
@@ -1276,6 +1276,7 @@ QDF_STATUS dp_rx_dump_fisa_stats(struct dp_soc *soc) 
		&((struct dp_fisa_rx_sw_ft *)rx_fst->base)[0];

	int ft_size = rx_fst->max_entries;

	int i;

	uint64_t avg_aggregated;



	dp_info("Num of flows programmed %d", rx_fst->add_flow_count);

	dp_info("Num of flows evicted %d", rx_fst->del_flow_count);
@@ -1292,9 +1293,9 @@ QDF_STATUS dp_rx_dump_fisa_stats(struct dp_soc *soc) 
		dp_info("num msdu aggr %d", sw_ft_entry->aggr_count);

		dp_info("flush count %d", sw_ft_entry->flush_count);

		dp_info("bytes_aggregated %llu", sw_ft_entry->bytes_aggregated);

		dp_info("avg aggregation %llu",

			sw_ft_entry->bytes_aggregated / sw_ft_entry->flush_count

			);

		avg_aggregated = sw_ft_entry->bytes_aggregated;

		qdf_do_div(avg_aggregated, sw_ft_entry->flush_count);

		dp_info("avg aggregation %llu", avg_aggregated);

		print_flow_tuple(&sw_ft_entry->rx_flow_tuple_info);

	}

	return QDF_STATUS_SUCCESS;