Merge "msm: ipa3: add rmnet_ctl enablement check" (3cb33329) · Commits · e / devices / android_kernel_fairphone_FP5

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

+15 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1571,13 +1571,14 @@ static int handle3_ingress_format(struct net_device *dev,
	}		}
	IPAWANDBG("ingress WAN pipe setup successfully\n");		IPAWANDBG("ingress WAN pipe setup successfully\n");

			if (ipa3_ctx->rmnet_ctl_enable) {
	ret = ipa3_setup_apps_low_lat_cons_pipe();		ret = ipa3_setup_apps_low_lat_cons_pipe();
	if (ret)		if (ret)
	goto low_lat_fail;		goto low_lat_fail;

	ingress_eps_mask \|= IPA_AP_INGRESS_EP_LOW_LAT;		ingress_eps_mask \|= IPA_AP_INGRESS_EP_LOW_LAT;

	IPAWANDBG("ingress low latency pipe setup successfully\n");		IPAWANDBG("ingress low latency pipe setup successfully\n");
			}

	low_lat_fail:		low_lat_fail:
	mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);		mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);
	@@ -1698,6 +1699,7 @@ static int handle3_egress_format(struct net_device *dev,
	return rc;		return rc;
	}		}
	IPAWANDBG("engress WAN pipe setup successfully\n");		IPAWANDBG("engress WAN pipe setup successfully\n");
			if (ipa3_ctx->rmnet_ctl_enable) {
	rc = ipa3_setup_apps_low_lat_prod_pipe();		rc = ipa3_setup_apps_low_lat_prod_pipe();
	if (rc) {		if (rc) {
	IPAWANERR("failed to setup egress low lat endpoint\n");		IPAWANERR("failed to setup egress low lat endpoint\n");
	@@ -1705,6 +1707,7 @@ static int handle3_egress_format(struct net_device *dev,
	goto low_lat_fail;		goto low_lat_fail;
	}		}
	IPAWANDBG("engress low lat pipe setup successfully\n");		IPAWANDBG("engress low lat pipe setup successfully\n");
			}
	mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);		mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);

	low_lat_fail:		low_lat_fail: