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

Commit 7da7f922 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: return the wifi stats when reset is set"

parents 94e92454 c3431169

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

+4 −5
Original line number Diff line number Diff line
@@ -2808,7 +2808,8 @@ static int rmnet_ipa_query_tethering_stats_wifi( 
	if (rc) {

		kfree(sap_stats);

		return rc;

	} else if (reset) {

	} else if (data == NULL) {

		IPAWANDBG("only reset wlan stats\n");

		kfree(sap_stats);

		return 0;

	}
@@ -2881,6 +2882,7 @@ int rmnet_ipa_query_tethering_stats_modem( 
		kfree(resp);

		return rc;

	} else if (data == NULL) {

		IPAWANDBG("only reset modem stats\n");

		kfree(req);

		kfree(resp);

		return 0;
@@ -3075,11 +3077,8 @@ int rmnet_ipa_query_tethering_stats_all( 
int rmnet_ipa_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data)

{

	enum ipa_upstream_type upstream_type;

	struct wan_ioctl_query_tether_stats tether_stats;

	int rc = 0;



	memset(&tether_stats, 0, sizeof(struct wan_ioctl_query_tether_stats));



	/* prevent string buffer overflows */

	data->upstreamIface[IFNAMSIZ-1] = '\0';
@@ -3100,7 +3099,7 @@ int rmnet_ipa_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data) 
	} else {

		IPAWANDBG(" reset modem-backhaul stats\n");

		rc = rmnet_ipa_query_tethering_stats_modem(

			&tether_stats, true);

			NULL, true);

		if (rc) {

			IPAWANERR("reset MODEM stats failed\n");

			return rc;

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

+4 −5
Original line number Diff line number Diff line
@@ -3112,7 +3112,8 @@ static int rmnet_ipa3_query_tethering_stats_wifi( 
		IPAWANERR("can't get ipa3_get_wlan_stats\n");

		kfree(sap_stats);

		return rc;

	} else if (reset) {

	} else if (data == NULL) {

		IPAWANDBG("only reset wlan stats\n");

		kfree(sap_stats);

		return 0;

	}
@@ -3183,6 +3184,7 @@ static int rmnet_ipa3_query_tethering_stats_modem( 
		kfree(resp);

		return rc;

	} else if (data == NULL) {

		IPAWANDBG("only reset modem stats\n");

		kfree(req);

		kfree(resp);

		return 0;
@@ -3377,11 +3379,8 @@ int rmnet_ipa3_query_tethering_stats_all( 
int rmnet_ipa3_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data)

{

	enum ipa_upstream_type upstream_type;

	struct wan_ioctl_query_tether_stats tether_stats;

	int rc = 0;



	memset(&tether_stats, 0, sizeof(struct wan_ioctl_query_tether_stats));



	/* prevent string buffer overflows */

	data->upstreamIface[IFNAMSIZ-1] = '\0';
@@ -3402,7 +3401,7 @@ int rmnet_ipa3_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data) 
	} else {

		IPAWANERR(" reset modem-backhaul stats\n");

		rc = rmnet_ipa3_query_tethering_stats_modem(

			&tether_stats, true);

			NULL, true);

		if (rc) {

			IPAWANERR("reset MODEM stats failed\n");

			return rc;