eal: remove deprecated coherent IO memory barriers

[dpdk.git] / drivers / net / bnxt / bnxt_txq.c

diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index 5ad4ee1..bdc7ffa 100644 (file)
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -8,7 +8,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 #include "bnxt_txr.h"
@@ -35,7 +34,7 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq)
        if (sw_ring) {
                for (i = 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) {
                        if (sw_ring[i].mbuf) {
-                               rte_pktmbuf_free(sw_ring[i].mbuf);
+                               rte_pktmbuf_free_seg(sw_ring[i].mbuf);
                                sw_ring[i].mbuf = NULL;
                        }
                }
@@ -91,14 +90,14 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
        if (rc)
                return rc;
 
-       if (queue_idx >= bp->max_tx_rings) {
+       if (queue_idx >= BNXT_MAX_RINGS(bp)) {
                PMD_DRV_LOG(ERR,
                        "Cannot create Tx ring %d. Only %d rings available\n",
                        queue_idx, bp->max_tx_rings);
                return -EINVAL;
        }
 
-       if (!nb_desc || nb_desc > MAX_TX_DESC_CNT) {
+       if (nb_desc < BNXT_MIN_RING_DESC || nb_desc > MAX_TX_DESC_CNT) {
                PMD_DRV_LOG(ERR, "nb_desc %d is invalid", nb_desc);
                rc = -EINVAL;
                goto out;
@@ -130,7 +129,9 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
        }
        txq->bp = bp;
        txq->nb_tx_desc = nb_desc;
-       txq->tx_free_thresh = tx_conf->tx_free_thresh;
+       txq->tx_free_thresh =
+               RTE_MIN(rte_align32pow2(nb_desc) / 4, RTE_BNXT_MAX_TX_BURST);
+
        txq->tx_deferred_start = tx_conf->tx_deferred_start;
 
        rc = bnxt_init_tx_ring_struct(txq, socket_id);