Merge tag 'LA.UM.9.12.1.r1-00300-SMxx50.QSSI12.0' of... (a1b53842) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/qcacld-3.0/components/action_oui/dispatcher/inc/wlan_action_oui_public_struct.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@
		* @ACTION_OUI_DISABLE_AGGRESSIVE_TX: disable aggressive TX in firmware
		* @ACTION_OUI_FORCE_MAX_NSS: Force Max NSS connection with few IOT APs
		* @ACTION_OUI_DISABLE_AGGRESSIVE_EDCA: disable aggressive EDCA with the ap
		* @ACTION_OUI_DISABLE_TWT: disable TWT with the ap
		* @ACTION_OUI_HOST_ONLY: host only action id start - placeholder.
		* New Firmware related "ACTION" needs to be added before this placeholder.
		* @ACTION_OUI_HOST_RECONN: reconnect to the same BSSID when wait for
		@@ -106,6 +107,7 @@ enum action_oui_id {
		ACTION_OUI_DISABLE_AGGRESSIVE_TX = 6,
		ACTION_OUI_FORCE_MAX_NSS = 7,
		ACTION_OUI_DISABLE_AGGRESSIVE_EDCA = 8,
		ACTION_OUI_DISABLE_TWT = 9,
		ACTION_OUI_HOST_ONLY,
		ACTION_OUI_HOST_RECONN = ACTION_OUI_HOST_ONLY,
		ACTION_OUI_MAXIMUM_ID

+7 −4

Original line number	Diff line number	Diff line
		@@ -2091,7 +2091,7 @@ uint32_t policy_mgr_get_mode_specific_conn_info(
		policy_mgr_err("Invalid Context");
		return count;
		}
		if (!ch_freq_list \|\| !vdev_id) {
		if (!vdev_id) {
		policy_mgr_err("Null pointer error");
		return count;
		}
		@@ -2100,13 +2100,16 @@ uint32_t policy_mgr_get_mode_specific_conn_info(
		psoc, mode, list);
		qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
		if (count == 1) {
		*ch_freq_list = pm_conc_connection_list[list[index]].freq;
		if (ch_freq_list)
		*ch_freq_list =
		pm_conc_connection_list[list[index]].freq;
		*vdev_id =
		pm_conc_connection_list[list[index]].vdev_id;
		} else {
		for (index = 0; index < count; index++) {
		ch_freq_list[index] = pm_conc_connection_list[
		list[index]].freq;
		if (ch_freq_list)
		ch_freq_list[index] =
		pm_conc_connection_list[list[index]].freq;

		vdev_id[index] =
		pm_conc_connection_list[list[index]].vdev_id;

+3 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,9 @@ QDF_STATUS tgt_fwol_pdev_param_send(struct wlan_objmgr_pdev *pdev,
		{
		struct wmi_unified *wmi_handle = get_wmi_unified_hdl_from_pdev(pdev);

		if (!wmi_handle)
		return QDF_STATUS_E_FAILURE;

		return wmi_unified_pdev_param_send(wmi_handle, &pdev_param,
		FWOL_WILDCARD_PDEV_ID);
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -3428,6 +3428,7 @@ QDF_STATUS wlan_ipa_cleanup(struct wlan_ipa_priv *ipa_ctx)
		/* Teardown IPA sys_pipe for MCC */
		if (wlan_ipa_uc_sta_is_enabled(ipa_ctx->config)) {
		wlan_ipa_teardown_sys_pipe(ipa_ctx);
		if (ipa_ctx->uc_loaded)
		qdf_cancel_work(&ipa_ctx->mcc_work);
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -965,7 +965,6 @@ QDF_STATUS wlan_ipa_uc_op_metering(struct wlan_ipa_priv *ipa_ctx,
		struct ipa_uc_quota_rsp *uc_quota_rsp;
		struct ipa_uc_quota_ind *uc_quota_ind;
		struct wlan_ipa_iface_context *iface_ctx;
		uint32_t ifindex;
		uint64_t quota_bytes;

		if (msg->op_code == WLAN_IPA_UC_OPCODE_SHARING_STATS) {
		@@ -996,10 +995,10 @@ QDF_STATUS wlan_ipa_uc_op_metering(struct wlan_ipa_priv *ipa_ctx,

		/* send quota exceeded indication to IPA */
		iface_ctx = wlan_ipa_get_iface(ipa_ctx, QDF_STA_MODE);
		ifindex = iface_ctx->dev->ifindex;
		quota_bytes = uc_quota_ind->quota_bytes;
		if (iface_ctx)
		qdf_ipa_broadcast_wdi_quota_reach_ind(ifindex,
		qdf_ipa_broadcast_wdi_quota_reach_ind(
		iface_ctx->dev->ifindex,
		quota_bytes);
		else
		ipa_err("Failed quota_reach_ind: NULL interface");