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

Commit e9dfda88 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: Change the hw version check for tethered stats"

parents c4e6f975 5d133c8b

drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c

+5 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ int ipa_hw_stats_init(void) 
		teth_stats_init->prod_mask = (

			IPA_CLIENT_BIT_32(IPA_CLIENT_MHI_PRIME_TETH_PROD) |

			IPA_CLIENT_BIT_32(IPA_CLIENT_USB_PROD));

		if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5)

		if (ipa3_ctx->ipa_wdi3_over_gsi)

			teth_stats_init->prod_mask |=

			IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_PROD);

		else
@@ -57,7 +57,7 @@ int ipa_hw_stats_init(void) 
			teth_stats_init->dst_ep_mask[ep_index] =

				IPA_CLIENT_BIT_32(IPA_CLIENT_USB_CONS);



			if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5)

			if (ipa3_ctx->ipa_wdi3_over_gsi)

				teth_stats_init->dst_ep_mask[ep_index] |=

				IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_CONS);

			else
@@ -78,7 +78,7 @@ int ipa_hw_stats_init(void) 
			IPA_CLIENT_BIT_32(IPA_CLIENT_Q6_WAN_PROD) |

			IPA_CLIENT_BIT_32(IPA_CLIENT_USB_PROD));



		if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5)

		if (ipa3_ctx->ipa_wdi3_over_gsi)

			teth_stats_init->prod_mask |=

			IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_PROD);

		else
@@ -102,7 +102,7 @@ int ipa_hw_stats_init(void) 
			teth_stats_init->dst_ep_mask[ep_index] =

			IPA_CLIENT_BIT_32(IPA_CLIENT_USB_CONS);



			if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5)

			if (ipa3_ctx->ipa_wdi3_over_gsi)

				teth_stats_init->dst_ep_mask[ep_index] |=

				IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_CONS);

			else
@@ -131,7 +131,7 @@ int ipa_hw_stats_init(void) 
			teth_stats_init->dst_ep_mask[ep_index] =

				IPA_CLIENT_BIT_32(IPA_CLIENT_USB_CONS);



			if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5)

			if (ipa3_ctx->ipa_wdi3_over_gsi)

				teth_stats_init->dst_ep_mask[ep_index] |=

				IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_CONS);

			else

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+3 −3
Original line number Diff line number Diff line
@@ -3483,7 +3483,7 @@ static int rmnet_ipa3_query_tethering_stats_hw( 
		}

	}



	if (ipa3_ctx_get_type(IPA_HW_TYPE) == IPA_HW_v4_5)

	if (ipa3_ctx->ipa_wdi3_over_gsi)

		wlan_client = IPA_CLIENT_WLAN2_CONS;

	else

		wlan_client = IPA_CLIENT_WLAN1_CONS;
@@ -3566,7 +3566,7 @@ static int rmnet_ipa3_query_tethering_stats_hw( 
		return rc;

	}



	if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5)

	if (ipa3_ctx->ipa_wdi3_over_gsi)

		wlan_client = IPA_CLIENT_WLAN2_CONS;

	else

		wlan_client = IPA_CLIENT_WLAN1_CONS;
@@ -3691,7 +3691,7 @@ static int rmnet_ipa3_query_tethering_stats_hw( 
	/* query WLAN UL stats */

	memset(con_stats, 0, sizeof(struct ipa_quota_stats_all));



	if (ipa3_ctx_get_type(IPA_HW_TYPE) == IPA_HW_v4_5)

	if (ipa3_ctx->ipa_wdi3_over_gsi)

		rc = ipa_query_teth_stats(IPA_CLIENT_WLAN2_PROD,

			con_stats, reset);

	else