msm: rmnet_ipa: do not release resource on pending data
In case there is pending data submitted to IPA, IPA RM resource should
not be released. The resource release happens only when all packets were
processed by IPA.
CRs-Fixed: 1116262
Change-Id: I19756cbe4f84a5d09853d6066362e4a2c9ae1f73
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
diff --git a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
index e653bcd..77c1d10 100644
--- a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1132,8 +1132,9 @@
dev->stats.tx_bytes += skb->len;
ret = NETDEV_TX_OK;
out:
- ipa_rm_inactivity_timer_release_resource(
- IPA_RM_RESOURCE_WWAN_0_PROD);
+ if (atomic_read(&wwan_ptr->outstanding_pkts) == 0)
+ ipa_rm_inactivity_timer_release_resource(
+ IPA_RM_RESOURCE_WWAN_0_PROD);
return ret;
}
@@ -1184,10 +1185,12 @@
wwan_ptr->outstanding_low);
netif_wake_queue(wwan_ptr->net);
}
+
+ if (atomic_read(&wwan_ptr->outstanding_pkts) == 0)
+ ipa_rm_inactivity_timer_release_resource(
+ IPA_RM_RESOURCE_WWAN_0_PROD);
__netif_tx_unlock_bh(netdev_get_tx_queue(dev, 0));
dev_kfree_skb_any(skb);
- ipa_rm_inactivity_timer_release_resource(
- IPA_RM_RESOURCE_WWAN_0_PROD);
}
/**