]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnxt_en: Fix xmit_more with BQL.
authorMichael Chan <michael.chan@broadcom.com>
Wed, 31 May 2017 00:03:00 +0000 (20:03 -0400)
committerSomasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Tue, 11 Jul 2017 00:04:09 +0000 (17:04 -0700)
Orabug: 264025332632559926366387

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>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 5815db7fd93880b100dd8b4bd444a30b0656c0ba..b20f2eaae3b5049b397a72423186e82fece7fd42 100644 (file)
@@ -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: