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

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

Merge "msm: ipa3: Skip AP+STA quota/stats support for IPA_HW_v4.7"

parents f03a5026 4385f796

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

+3 −1
Original line number Diff line number Diff line
@@ -3104,7 +3104,8 @@ static int rmnet_ipa3_set_data_quota_wifi(struct wan_ioctl_set_data_quota *data) 
	IPAWANERR("iface name %s, quota %lu\n",

		  data->interface_name, (unsigned long) data->quota_mbytes);



	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5) {

	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 &&

		ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) {

		IPADBG("use ipa-uc for quota\n");

		rc = ipa3_uc_quota_monitor(data->set_quota);

	} else {
@@ -3835,6 +3836,7 @@ int rmnet_ipa3_query_tethering_stats_all( 
	} else if (upstream_type == IPA_UPSTEAM_WLAN) {

		IPAWANDBG_LOW(" query wifi-backhaul stats\n");

		if (ipa3_ctx->ipa_hw_type < IPA_HW_v4_5 ||

			ipa3_ctx->ipa_hw_type == IPA_HW_v4_7 ||

			!ipa3_ctx->hw_stats.enabled) {

			IPAWANDBG("hw version %d,hw_stats.enabled %d\n",

				ipa3_ctx->ipa_hw_type,

drivers/platform/msm/ipa/test/ipa_test_hw_stats.c

+2 −1
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ static int ipa_test_hw_stats_set_uc_event_ring(void *priv) 
	/* set uc event ring */

	IPA_UT_INFO("========set uc event ring ========\n");



	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5) {

	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 &&

		ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) {

		if (ipa3_ctx->uc_ctx.uc_loaded &&

			!ipa3_ctx->uc_ctx.uc_event_ring_valid) {

			if (ipa3_uc_setup_event_ring()) {