net/bnxt: support Thor WC TCAM

[dpdk.git] / drivers / net / octeontx / octeontx_rxtx.h

diff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h
index 8b46105..2ed28ea 100644 (file)
--- a/drivers/net/octeontx/octeontx_rxtx.h
+++ b/drivers/net/octeontx/octeontx_rxtx.h
@@ -5,7 +5,7 @@
 #ifndef        __OCTEONTX_RXTX_H__
 #define        __OCTEONTX_RXTX_H__
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define OFFLOAD_FLAGS                                  \
        uint16_t rx_offload_flags;                      \
@@ -337,8 +337,7 @@ __octeontx_xmit_prepare(struct rte_mbuf *tx_pkt, uint64_t *cmd_buf,
                __mempool_check_cookies(tx_pkt->pool, (void **)&tx_pkt,
                                        1, 0);
        /* Get the gaura Id */
-       gaura_id = octeontx_fpa_bufpool_gpool((uintptr_t)
-                                             tx_pkt->pool->pool_id);
+       gaura_id = octeontx_fpa_bufpool_gaura((uintptr_t)tx_pkt->pool->pool_id);
 
        /* Setup PKO_SEND_BUFLINK_S */
        cmd_buf[nb_desc++] = PKO_SEND_BUFLINK_SUBDC |
@@ -373,7 +372,7 @@ __octeontx_xmit_mseg_prepare(struct rte_mbuf *tx_pkt, uint64_t *cmd_buf,
                /* To handle case where mbufs belong to diff pools, like
                 * fragmentation
                 */
-               gaura_id = octeontx_fpa_bufpool_gpool((uintptr_t)
+               gaura_id = octeontx_fpa_bufpool_gaura((uintptr_t)
                                                      tx_pkt->pool->pool_id);
 
                /* Setup PKO_SEND_GATHER_S */
@@ -418,7 +417,7 @@ __octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        struct octeontx_txq *txq = tx_queue;
        octeontx_dq_t *dq = &txq->dq;
        uint16_t count = 0, nb_desc;
-       rte_cio_wmb();
+       rte_io_wmb();
 
        while (count < nb_pkts) {
                if (unlikely(*((volatile int64_t *)dq->fc_status_va) < 0))