net/ngbe: support jumbo frame

[dpdk.git] / drivers / net / ixgbe / ixgbe_fdir.c

diff --git a/drivers/net/ixgbe/ixgbe_fdir.c b/drivers/net/ixgbe/ixgbe_fdir.c
index 11b9eff..7894047 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_fdir.c
+++ b/drivers/net/ixgbe/ixgbe_fdir.c
@@ -13,7 +13,7 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_vxlan.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ixgbe_logs.h"
@@ -90,9 +90,9 @@ static int fdir_enable_82599(struct ixgbe_hw *hw, uint32_t fdirctrl);
 static uint32_t ixgbe_atr_compute_hash_82599(union ixgbe_atr_input *atr_input,
                                 uint32_t key);
 static uint32_t atr_compute_sig_hash_82599(union ixgbe_atr_input *input,
-               enum rte_fdir_pballoc_type pballoc);
+               enum rte_eth_fdir_pballoc_type pballoc);
 static uint32_t atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
-               enum rte_fdir_pballoc_type pballoc);
+               enum rte_eth_fdir_pballoc_type pballoc);
 static int fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
                        union ixgbe_atr_input *input, uint8_t queue,
                        uint32_t fdircmd, uint32_t fdirhash,
@@ -163,20 +163,20 @@ fdir_enable_82599(struct ixgbe_hw *hw, uint32_t fdirctrl)
  * flexbytes matching field, and drop queue (only for perfect matching mode).
  */
 static inline int
-configure_fdir_flags(const struct rte_fdir_conf *conf, uint32_t *fdirctrl)
+configure_fdir_flags(const struct rte_eth_fdir_conf *conf, uint32_t *fdirctrl)
 {
        *fdirctrl = 0;
 
        switch (conf->pballoc) {
-       case RTE_FDIR_PBALLOC_64K:
+       case RTE_ETH_FDIR_PBALLOC_64K:
                /* 8k - 1 signature filters */
                *fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_64K;
                break;
-       case RTE_FDIR_PBALLOC_128K:
+       case RTE_ETH_FDIR_PBALLOC_128K:
                /* 16k - 1 signature filters */
                *fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_128K;
                break;
-       case RTE_FDIR_PBALLOC_256K:
+       case RTE_ETH_FDIR_PBALLOC_256K:
                /* 32k - 1 signature filters */
                *fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_256K;
                break;
@@ -807,13 +807,13 @@ ixgbe_atr_compute_hash_82599(union ixgbe_atr_input *atr_input,
 
 static uint32_t
 atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
-               enum rte_fdir_pballoc_type pballoc)
+               enum rte_eth_fdir_pballoc_type pballoc)
 {
-       if (pballoc == RTE_FDIR_PBALLOC_256K)
+       if (pballoc == RTE_ETH_FDIR_PBALLOC_256K)
                return ixgbe_atr_compute_hash_82599(input,
                                IXGBE_ATR_BUCKET_HASH_KEY) &
                                PERFECT_BUCKET_256KB_HASH_MASK;
-       else if (pballoc == RTE_FDIR_PBALLOC_128K)
+       else if (pballoc == RTE_ETH_FDIR_PBALLOC_128K)
                return ixgbe_atr_compute_hash_82599(input,
                                IXGBE_ATR_BUCKET_HASH_KEY) &
                                PERFECT_BUCKET_128KB_HASH_MASK;
@@ -850,15 +850,15 @@ ixgbe_fdir_check_cmd_complete(struct ixgbe_hw *hw, uint32_t *fdircmd)
  */
 static uint32_t
 atr_compute_sig_hash_82599(union ixgbe_atr_input *input,
-               enum rte_fdir_pballoc_type pballoc)
+               enum rte_eth_fdir_pballoc_type pballoc)
 {
        uint32_t bucket_hash, sig_hash;
 
-       if (pballoc == RTE_FDIR_PBALLOC_256K)
+       if (pballoc == RTE_ETH_FDIR_PBALLOC_256K)
                bucket_hash = ixgbe_atr_compute_hash_82599(input,
                                IXGBE_ATR_BUCKET_HASH_KEY) &
                                SIG_BUCKET_256KB_HASH_MASK;
-       else if (pballoc == RTE_FDIR_PBALLOC_128K)
+       else if (pballoc == RTE_ETH_FDIR_PBALLOC_128K)
                bucket_hash = ixgbe_atr_compute_hash_82599(input,
                                IXGBE_ATR_BUCKET_HASH_KEY) &
                                SIG_BUCKET_128KB_HASH_MASK;