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

Commit e7c6403a 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: Fix the memory leak on exception"

parents ade5764c 451af8b0

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

+6 −4
Original line number Diff line number Diff line
@@ -1144,14 +1144,16 @@ static void apps_ipa_tx_complete_notify(void *priv, 
	struct net_device *dev = (struct net_device *)priv;

	struct wwan_private *wwan_ptr;



	if (evt != IPA_WRITE_DONE) {

		IPAWANDBG("unsupported event on Tx callback\n");

	if (dev != ipa_netdevs[0]) {

		IPAWANDBG("Received pre-SSR packet completion\n");

		dev_kfree_skb_any(skb);

		return;

	}



	if (dev != ipa_netdevs[0]) {

		IPAWANDBG("Received pre-SSR packet completion\n");

	if (evt != IPA_WRITE_DONE) {

		IPAWANERR("unsupported evt on Tx callback, Drop the packet\n");

		dev_kfree_skb_any(skb);

		dev->stats.tx_dropped++;

		return;

	}

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

+6 −4
Original line number Diff line number Diff line
@@ -1157,14 +1157,16 @@ static void apps_ipa_tx_complete_notify(void *priv, 
	struct net_device *dev = (struct net_device *)priv;

	struct ipa3_wwan_private *wwan_ptr;



	if (evt != IPA_WRITE_DONE) {

		IPAWANDBG("unsupported event on Tx callback\n");

	if (dev != IPA_NETDEV()) {

		IPAWANDBG("Received pre-SSR packet completion\n");

		dev_kfree_skb_any(skb);

		return;

	}



	if (dev != IPA_NETDEV()) {

		IPAWANDBG("Received pre-SSR packet completion\n");

	if (evt != IPA_WRITE_DONE) {

		IPAWANERR("unsupported evt on Tx callback, Drop the packet\n");

		dev_kfree_skb_any(skb);

		dev->stats.tx_dropped++;

		return;

	}