Merge commit 'debc9305ed8c51dccb4c9695cf0b170f0237d722' into wlan-cld3.driver.lnx.2.0.r18 (32155edb) · Commits · e / devices / android_kernel_fairphone_FP4

components/pmo/core/src/wlan_pmo_suspend_resume.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1080,6 +1080,8 @@ QDF_STATUS pmo_core_psoc_bus_runtime_suspend(struct wlan_objmgr_psoc *psoc,
		PMO_CORE_PSOC_RUNTIME_PM_QDF_BUG(QDF_STATUS_SUCCESS !=
		pmo_core_psoc_configure_resume(psoc, true));

		hif_pm_set_link_state(hif_ctx, HIF_PM_LINK_STATE_UP);

		resume_htc:
		PMO_CORE_PSOC_RUNTIME_PM_QDF_BUG(QDF_STATUS_SUCCESS !=
		pmo_tgt_psoc_set_runtime_pm_inprogress(psoc, false));

+8 −1

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev,
		while (msdu) {
		struct ol_txrx_vdev_t *tx_vdev;
		void *rx_desc;
		uint16_t off = 0;
		/*
		* Remember the next list elem, because our processing
		* may cause the MSDU to get linked into a different list.
		@@ -203,8 +204,14 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev,
		continue;
		}

		if (pdev->cfg.is_high_latency)
		off = htt_rx_msdu_rx_desc_size_hl(
		pdev->htt_pdev,
		rx_desc);

		if (vdev->opmode == wlan_op_mode_ap &&
		qdf_nbuf_is_ipv4_eapol_pkt(msdu) &&
		__qdf_nbuf_data_is_ipv4_eapol_pkt(
		qdf_nbuf_data(msdu) + off) &&
		qdf_mem_cmp(qdf_nbuf_data(msdu) +
		QDF_NBUF_DEST_MAC_OFFSET,
		vdev->mac_addr.raw,

+34 −1

Original line number	Diff line number	Diff line
		@@ -231,6 +231,38 @@ static void hdd_hif_set_attribute(struct hif_opaque_softc *hif_ctx)
		{}
		#endif

		/**

		* hdd_hif_set_ce_max_yield_time() - Wrapper API to set CE max yield time
		* @hif_ctx: hif context
		* @bus_type: underlying bus type
		* @ce_service_max_yield_time: max yield time to be set
		*
		* Return: None
		*/
		#if defined(CONFIG_SLUB_DEBUG_ON)
		#define CE_SNOC_MAX_YIELD_TIME_US 2000

		static void hdd_hif_set_ce_max_yield_time(struct hif_opaque_softc *hif_ctx,
		enum qdf_bus_type bus_type,
		uint32_t ce_service_max_yield_time)
		{
		if (bus_type == QDF_BUS_TYPE_SNOC &&
		ce_service_max_yield_time < CE_SNOC_MAX_YIELD_TIME_US)
		ce_service_max_yield_time = CE_SNOC_MAX_YIELD_TIME_US;

		hif_set_ce_service_max_yield_time(hif_ctx, ce_service_max_yield_time);
		}

		#else
		static void hdd_hif_set_ce_max_yield_time(struct hif_opaque_softc *hif_ctx,
		enum qdf_bus_type bus_type,
		uint32_t ce_service_max_yield_time)
		{
		hif_set_ce_service_max_yield_time(hif_ctx, ce_service_max_yield_time);
		}
		#endif

		/**
		* hdd_init_cds_hif_context() - API to set CDS HIF Context
		* @hif: HIF Context
		@@ -350,7 +382,8 @@ int hdd_hif_open(struct device dev, void bdev, const struct hif_bus_id *bid,
		}
		}

		hif_set_ce_service_max_yield_time(hif_ctx,
		hdd_hif_set_ce_max_yield_time(
		hif_ctx, bus_type,
		cfg_get(hdd_ctx->psoc,
		CFG_DP_CE_SERVICE_MAX_YIELD_TIME));
		ucfg_pmo_psoc_set_hif_handle(hdd_ctx->psoc, hif_ctx);

+1 −7

Original line number	Diff line number	Diff line
		@@ -2890,13 +2890,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
		return QDF_STATUS_SUCCESS;
		}

		/**
		* hdd_is_any_sta_connecting() - check if any sta is connecting
		* @hdd_ctx: hdd context
		*
		* Return: true if any sta is connecting
		*/
		static bool hdd_is_any_sta_connecting(struct hdd_context *hdd_ctx)
		bool hdd_is_any_sta_connecting(struct hdd_context *hdd_ctx)
		{
		struct hdd_adapter adapter = NULL, next_adapter = NULL;
		struct hdd_station_ctx *sta_ctx;

+7 −0

Original line number	Diff line number	Diff line
		@@ -297,4 +297,11 @@ hdd_check_and_disconnect_sta_on_invalid_channel(struct hdd_context *hdd_ctx,
		*/
		void hdd_stop_sap_due_to_invalid_channel(struct work_struct *work);

		/**
		* hdd_is_any_sta_connecting() - check if any sta is connecting
		* @hdd_ctx: hdd context
		*
		* Return: true if any sta is connecting
		*/
		bool hdd_is_any_sta_connecting(struct hdd_context *hdd_ctx);
		#endif /* end #if !defined(WLAN_HDD_HOSTAPD_H) */