net/cnxk: support CPT CTX write through microcode op

[dpdk.git] / drivers / net / ixgbe / ixgbe_rxtx_vec_common.h

diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index 414840a..cd34d40 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -5,7 +5,7 @@
 #ifndef _IXGBE_RXTX_VEC_COMMON_H_
 #define _IXGBE_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "ixgbe_ethdev.h"
 #include "ixgbe_rxtx.h"
@@ -152,7 +152,7 @@ _ixgbe_tx_queue_release_mbufs_vec(struct ixgbe_tx_queue *txq)
        /* release the used mbufs in sw_ring */
        for (i = txq->tx_next_dd - (txq->tx_rs_thresh - 1);
             i != txq->tx_tail;
-            i = (i + 1) & max_desc) {
+            i = (i + 1) % txq->nb_tx_desc) {
                txe = &txq->sw_ring_v[i];
                rte_pktmbuf_free_seg(txe->mbuf);
        }
@@ -168,7 +168,6 @@ _ixgbe_tx_queue_release_mbufs_vec(struct ixgbe_tx_queue *txq)
 static inline void
 _ixgbe_rx_queue_release_mbufs_vec(struct ixgbe_rx_queue *rxq)
 {
-       const unsigned int mask = rxq->nb_rx_desc - 1;
        unsigned int i;
 
        if (rxq->sw_ring == NULL || rxq->rxrearm_nb >= rxq->nb_rx_desc)
@@ -183,7 +182,7 @@ _ixgbe_rx_queue_release_mbufs_vec(struct ixgbe_rx_queue *rxq)
        } else {
                for (i = rxq->rx_tail;
                     i != rxq->rxrearm_start;
-                    i = (i + 1) & mask) {
+                    i = (i + 1) % rxq->nb_rx_desc) {
                        if (rxq->sw_ring[i].mbuf != NULL)
                                rte_pktmbuf_free_seg(rxq->sw_ring[i].mbuf);
                }
@@ -278,17 +277,12 @@ static inline int
 ixgbe_rx_vec_dev_conf_condition_check_default(struct rte_eth_dev *dev)
 {
 #ifndef RTE_LIBRTE_IEEE1588
-       struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-       struct rte_fdir_conf *fconf = &dev->data->dev_conf.fdir_conf;
+       struct rte_eth_fdir_conf *fconf = &dev->data->dev_conf.fdir_conf;
 
        /* no fdir support */
        if (fconf->mode != RTE_FDIR_MODE_NONE)
                return -1;
 
-       /* no header split support */
-       if (rxmode->header_split == 1)
-               return -1;
-
        return 0;
 #else
        RTE_SET_USED(dev);