From: Michael Chan <michael.chan@broadcom.com>
Date: Wed, 31 May 2017 00:03:00 +0000 (-0400)
Subject: bnxt_en: Fix xmit_more with BQL.
X-Git-Tag: v4.1.12-106.0.20170710_2300~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c79d6a96bad082a430f9b5318a3db0f30f0a812c;p=users%2Fjedix%2Flinux-maple.git

bnxt_en: Fix xmit_more with BQL.

Orabug: 26402533, 26325599, 26366387

We need to write the doorbell if BQL has stopped the queue and
skb->xmit_more is set.  Otherwise it is possible for the tx queue to
rot and cause tx timeout.

Fixes: 4d172f21cefe ("bnxt_en: Implement xmit_more.")
Suggested-by: Yuval Mintz <yuval.mintz@cavium.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit ffe406457753a7ca2061ecc8c4d3971623066911)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
---

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 5815db7fd938..b20f2eaae3b5 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -480,7 +480,7 @@ normal_tx:
 	prod = NEXT_TX(prod);
 	txr->tx_prod = prod;
 
-	if (!skb->xmit_more)
+	if (!skb->xmit_more || netif_xmit_stopped(txq))
 		bnxt_db_write(bp, txr->tx_doorbell, DB_KEY_TX | prod);
 
 tx_done: