drivers/net: do not use ethdev driver

[dpdk.git] / drivers / net / i40e / i40e_fdir.c

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 91d91aa..28cc554 100644 (file)
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -119,8 +119,6 @@ static int i40e_fdir_filter_programming(struct i40e_pf *pf,
                        enum i40e_filter_pctype pctype,
                        const struct rte_eth_fdir_filter *filter,
                        bool add);
-static int i40e_fdir_flush(struct rte_eth_dev *dev);
-
 static int i40e_fdir_filter_convert(const struct rte_eth_fdir_filter *input,
                         struct i40e_fdir_filter *filter);
 static struct i40e_fdir_filter *
@@ -259,7 +257,7 @@ i40e_fdir_setup(struct i40e_pf *pf)
 
        /* reserve memory for the fdir programming packet */
        snprintf(z_name, sizeof(z_name), "%s_%s_%d",
-                       eth_dev->driver->pci_drv.driver.name,
+                       eth_dev->data->drv_name,
                        I40E_FDIR_MZ_NAME,
                        eth_dev->data->port_id);
        mz = i40e_memzone_reserve(z_name, I40E_FDIR_PKT_LEN, SOCKET_ID_ANY);
@@ -1325,7 +1323,7 @@ i40e_fdir_filter_programming(struct i40e_pf *pf,
  * i40e_fdir_flush - clear all filters of Flow Director table
  * @pf: board private structure
  */
-static int
+int
 i40e_fdir_flush(struct rte_eth_dev *dev)
 {
        struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -1594,17 +1592,14 @@ i40e_fdir_filter_restore(struct i40e_pf *pf)
        struct rte_eth_dev *dev = I40E_VSI_TO_ETH_DEV(pf->main_vsi);
        struct i40e_fdir_filter_list *fdir_list = &pf->fdir.fdir_list;
        struct i40e_fdir_filter *f;
-#ifdef RTE_LIBRTE_I40E_DEBUG_DRIVER
        struct i40e_hw *hw = I40E_PF_TO_HW(pf);
        uint32_t fdstat;
        uint32_t guarant_cnt;  /**< Number of filters in guaranteed spaces. */
        uint32_t best_cnt;     /**< Number of filters in best effort spaces. */
-#endif /* RTE_LIBRTE_I40E_DEBUG_DRIVER */
 
        TAILQ_FOREACH(f, fdir_list, rules)
                i40e_add_del_fdir_filter(dev, &f->fdir, TRUE);
 
-#ifdef RTE_LIBRTE_I40E_DEBUG_DRIVER
        fdstat = I40E_READ_REG(hw, I40E_PFQF_FDSTAT);
        guarant_cnt =
                (uint32_t)((fdstat & I40E_PFQF_FDSTAT_GUARANT_CNT_MASK) >>
@@ -1612,8 +1607,7 @@ i40e_fdir_filter_restore(struct i40e_pf *pf)
        best_cnt =
                (uint32_t)((fdstat & I40E_PFQF_FDSTAT_BEST_CNT_MASK) >>
                           I40E_PFQF_FDSTAT_BEST_CNT_SHIFT);
-#endif /* RTE_LIBRTE_I40E_DEBUG_DRIVER */
 
-       PMD_DRV_LOG(INFO, "FDIR: Guarant count: %d,  Best count: %d\n",
+       PMD_DRV_LOG(INFO, "FDIR: Guarant count: %d,  Best count: %d",
                    guarant_cnt, best_cnt);
 }