Merge "msm: rmnet_ipa: do not release resource on pending data"

This commit is contained in:
Linux Build Service Account 2017-02-09 03:11:29 -08:00 committed by Gerrit - the friendly Code Review server
commit 99e6ec4c60

View file

@ -1154,6 +1154,7 @@ send:
dev->stats.tx_bytes += skb->len;
ret = NETDEV_TX_OK;
out:
if (atomic_read(&wwan_ptr->outstanding_pkts) == 0)
ipa_rm_inactivity_timer_release_resource(
IPA_RM_RESOURCE_WWAN_0_PROD);
return ret;
@ -1206,10 +1207,12 @@ static void apps_ipa_tx_complete_notify(void *priv,
wwan_ptr->outstanding_low);
netif_wake_queue(wwan_ptr->net);
}
__netif_tx_unlock_bh(netdev_get_tx_queue(dev, 0));
dev_kfree_skb_any(skb);
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);
}
/**