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

Commit a5ef7581 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: check for carrier state before queue wakeup"

parents 5fade566 b8c5f7e6

drivers/net/ethernet/msm/ecm_ipa.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1235,6 +1235,7 @@ static void ecm_ipa_tx_complete_notify(void *priv, 




	atomic_dec(&ecm_ipa_ctx->outstanding_pkts);

	atomic_dec(&ecm_ipa_ctx->outstanding_pkts);

	if (netif_queue_stopped(ecm_ipa_ctx->net) &&

	if (netif_queue_stopped(ecm_ipa_ctx->net) &&

		netif_carrier_ok(ecm_ipa_ctx->net) &&

		atomic_read(&ecm_ipa_ctx->outstanding_pkts) <

		atomic_read(&ecm_ipa_ctx->outstanding_pkts) <

					(ecm_ipa_ctx->outstanding_low)) {

					(ecm_ipa_ctx->outstanding_low)) {

		ECM_IPA_DEBUG("outstanding low (%d) - waking up queue\n",

		ECM_IPA_DEBUG("outstanding low (%d) - waking up queue\n",

drivers/net/ethernet/msm/rndis_ipa.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -977,6 +977,7 @@ static void rndis_ipa_tx_complete_notify(void *private, 




	atomic_dec(&rndis_ipa_ctx->outstanding_pkts);

	atomic_dec(&rndis_ipa_ctx->outstanding_pkts);

	if (netif_queue_stopped(rndis_ipa_ctx->net) &&

	if (netif_queue_stopped(rndis_ipa_ctx->net) &&

		netif_carrier_ok(rndis_ipa_ctx->net) &&

		atomic_read(&rndis_ipa_ctx->outstanding_pkts) <

		atomic_read(&rndis_ipa_ctx->outstanding_pkts) <

					(rndis_ipa_ctx->outstanding_low)) {

					(rndis_ipa_ctx->outstanding_low)) {

		RNDIS_IPA_DEBUG("outstanding low boundary reached (%d)n",

		RNDIS_IPA_DEBUG("outstanding low boundary reached (%d)n",