bnx2x: organize BDs calculation for stop/resume

Put the numbers used for stop/resume queue in a single place and
fix the condition for sanity check.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 5aeb034fa05c..e879e19eb0d6 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -221,7 +221,7 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata)
 
                 if ((netif_tx_queue_stopped(txq)) &&
                     (bp->state == BNX2X_STATE_OPEN) &&
-                    (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4))
+                    (bnx2x_tx_avail(bp, txdata) >= MAX_DESC_PER_TX_PKT))
                         netif_tx_wake_queue(txq);
 
                 __netif_tx_unlock(txq);
@@ -2948,7 +2948,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
            txdata->cid, fp_index, txdata_index, txdata, fp); */
 
         if (unlikely(bnx2x_tx_avail(bp, txdata) <
-                     (skb_shinfo(skb)->nr_frags + 3))) {
+                        skb_shinfo(skb)->nr_frags +
+                        BDS_PER_TX_PKT +
+                        NEXT_CNT_PER_TX_PKT(MAX_BDS_PER_TX_PKT))) {
                 bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++;
                 netif_tx_stop_queue(txq);
                 BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
@@ -3223,7 +3225,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         txdata->tx_bd_prod += nbd;
 
-        if (unlikely(bnx2x_tx_avail(bp, txdata) < MAX_SKB_FRAGS + 4)) {
+        if (unlikely(bnx2x_tx_avail(bp, txdata) < MAX_DESC_PER_TX_PKT)) {
                 netif_tx_stop_queue(txq);
 
                 /* paired memory barrier is in bnx2x_tx_int(), we have to keep
@@ -3232,7 +3234,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 smp_mb();
 
                 bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++;
-                if (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4)
+                if (bnx2x_tx_avail(bp, txdata) >= MAX_DESC_PER_TX_PKT)
                         netif_tx_wake_queue(txq);
         }
         txdata->tx_pkt++;