Merge acc180c6cca3d1f9dea179e5978d888a11559142 on remote branch (a0eaf52b) · Commits · e / devices / android_kernel_fairphone_FP5

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,7 +68,9 @@ include $(foreach chip, $(TARGET_WLAN_CHIP), $(LOCAL_PATH)/.$(chip)/Android.mk)

		else # Multi-ok check

		ifeq ($(WLAN_PROFILE),)
		WLAN_PROFILE := default
		endif

		ifeq ($(LOCAL_DEV_NAME), qcacld-3.0)

Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -3507,6 +3507,7 @@ cppflags-$(CONFIG_WLAN_SUPPORT_DATA_STALL) += -DWLAN_SUPPORT_DATA_STALL
		cppflags-$(CONFIG_WLAN_SUPPORT_TXRX_HL_BUNDLE) += -DWLAN_SUPPORT_TXRX_HL_BUNDLE
		cppflags-$(CONFIG_QCN7605_PCIE_SHADOW_REG_SUPPORT) += -DQCN7605_PCIE_SHADOW_REG_SUPPORT
		cppflags-$(CONFIG_MARK_ICMP_REQ_TO_FW) += -DWLAN_DP_FEATURE_MARK_ICMP_REQ_TO_FW
		cppflags-$(CONFIG_WLAN_SKIP_BAR_UPDATE) += -DWLAN_SKIP_BAR_UPDATE

		ifdef CONFIG_MAX_LOGS_PER_SEC
		ccflags-y += -DWLAN_MAX_LOGS_PER_SEC=$(CONFIG_MAX_LOGS_PER_SEC)

components/cp_stats/dispatcher/src/wlan_cp_stats_mc_ucfg_api.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -253,16 +253,21 @@ ucfg_twt_get_all_peer_session_params(struct wlan_objmgr_psoc *psoc_obj,
		}

		if (opmode == QDF_STA_MODE &&
		num_twt_session >= TWT_PEER_MAX_SESSIONS)
		num_twt_session >= TWT_PEER_MAX_SESSIONS) {
		wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);
		goto done;
		}

		if (opmode == QDF_SAP_MODE &&
		num_twt_session >= (sap_max_peer * TWT_PEER_MAX_SESSIONS))
		num_twt_session >= (sap_max_peer * TWT_PEER_MAX_SESSIONS)) {
		wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);
		goto done;
		}

		peer_next = wlan_peer_get_next_active_peer_of_vdev(
		vdev, peer_list, peer,
		WLAN_CP_STATS_ID);
		wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);
		peer = peer_next;
		}

components/mlme/core/inc/wlan_mlme_main.h

+22 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,7 @@ struct mscs_req_info {
		* requests from some IOT APs
		* @ba_2k_jump_iot_ap: This is set to true if connected to the ba 2k jump IOT AP
		* @bad_htc_he_iot_ap: Set to true if connected to AP who can't decode htc he
		* @is_usr_ps_enabled: Is Power save enabled
		*/
		struct mlme_legacy_priv {
		bool chan_switch_in_progress;
		@@ -289,6 +290,7 @@ struct mlme_legacy_priv {
		qdf_time_t last_delba_sent_time;
		bool ba_2k_jump_iot_ap;
		bool bad_htc_he_iot_ap;
		bool is_usr_ps_enabled;
		};


		@@ -701,6 +703,26 @@ mlme_set_operations_bitmap(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
		void
		mlme_clear_operations_bitmap(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id);

		/**
		* mlme_get_cfg_wlm_level() - Get the WLM level value
		* @psoc: pointer to psoc object
		* @level: level that needs to be filled.
		*
		* Return: QDF Status
		*/
		QDF_STATUS mlme_get_cfg_wlm_level(struct wlan_objmgr_psoc *psoc,
		uint8_t *level);

		/**
		* mlme_get_cfg_wlm_reset() - Get the WLM reset flag
		* @psoc: pointer to psoc object
		* @reset: reset that needs to be filled.
		*
		* Return: QDF Status
		*/
		QDF_STATUS mlme_get_cfg_wlm_reset(struct wlan_objmgr_psoc *psoc,
		bool *reset);

		#define MLME_IS_ROAM_STATE_RSO_ENABLED(psoc, vdev_id) \
		(mlme_get_roam_state(psoc, vdev_id) == WLAN_ROAM_RSO_ENABLED)

components/mlme/core/src/wlan_mlme_main.c

+29 −2

Original line number	Diff line number	Diff line
		@@ -794,8 +794,6 @@ static void mlme_init_qos_cfg(struct wlan_objmgr_psoc *psoc,
		cfg_get(psoc, CFG_SAP_MAX_INACTIVITY_OVERRIDE);
		qos_aggr_params->sap_uapsd_enabled =
		cfg_get(psoc, CFG_SAP_QOS_UAPSD);
		qos_aggr_params->reject_addba_req =
		cfg_get(psoc, CFG_REJECT_ADDBA_REQ);
		}

		static void mlme_init_mbo_cfg(struct wlan_objmgr_psoc *psoc,
		@@ -2210,6 +2208,7 @@ static void mlme_init_fe_wlm_in_cfg(struct wlan_objmgr_psoc *psoc,
		struct wlan_mlme_fe_wlm *wlm_config)
		{
		wlm_config->latency_enable = cfg_get(psoc, CFG_LATENCY_ENABLE);
		wlm_config->latency_reset = cfg_get(psoc, CFG_LATENCY_RESET);
		wlm_config->latency_level = cfg_get(psoc, CFG_LATENCY_LEVEL);
		wlm_config->latency_flags[0] = cfg_get(psoc, CFG_LATENCY_FLAGS_NORMAL);
		wlm_config->latency_flags[1] = cfg_get(psoc, CFG_LATENCY_FLAGS_MOD);
		@@ -2968,6 +2967,34 @@ mlme_clear_operations_bitmap(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
		wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_OBJMGR_ID);
		}

		QDF_STATUS mlme_get_cfg_wlm_level(struct wlan_objmgr_psoc *psoc,
		uint8_t *level)
		{
		struct wlan_mlme_psoc_ext_obj *mlme_obj;

		mlme_obj = mlme_get_psoc_ext_obj(psoc);
		if (!mlme_obj)
		return QDF_STATUS_E_FAILURE;

		*level = mlme_obj->cfg.wlm_config.latency_level;

		return QDF_STATUS_SUCCESS;
		}

		QDF_STATUS mlme_get_cfg_wlm_reset(struct wlan_objmgr_psoc *psoc,
		bool *reset)
		{
		struct wlan_mlme_psoc_ext_obj *mlme_obj;

		mlme_obj = mlme_get_psoc_ext_obj(psoc);
		if (!mlme_obj)
		return QDF_STATUS_E_FAILURE;

		*reset = mlme_obj->cfg.wlm_config.latency_reset;

		return QDF_STATUS_SUCCESS;
		}

		enum roam_offload_state
		mlme_get_roam_state(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
		{