From: Jie Liu <[email protected]> Rename the sxe2_fnav_cid_mgr, sxe2_fnav_cid_mgr_list_t, sxe2_fnav_count_resource and sxe2_fnav_get_filter_cid symbols to the sxe2_flow_* prefix for consistency with the flow module naming.
Cc: [email protected] Signed-off-by: Jie Liu <[email protected]> --- drivers/net/sxe2/sxe2_cmd_chnl.c | 2 +- drivers/net/sxe2/sxe2_cmd_chnl.h | 2 +- drivers/net/sxe2/sxe2_flow.c | 46 ++++++++++++++--------------- drivers/net/sxe2/sxe2_flow.h | 6 ++-- drivers/net/sxe2/sxe2_flow_define.h | 12 ++++---- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/net/sxe2/sxe2_cmd_chnl.c b/drivers/net/sxe2/sxe2_cmd_chnl.c index b09989fe50..3229c72597 100644 --- a/drivers/net/sxe2/sxe2_cmd_chnl.c +++ b/drivers/net/sxe2/sxe2_cmd_chnl.c @@ -1800,7 +1800,7 @@ int32_t sxe2_drv_flow_fnav_free_stat(struct sxe2_adapter *adapter, uint32_t stat } int32_t sxe2_drv_flow_fnav_query_stat(struct sxe2_adapter *adapter, - struct sxe2_fnav_cid_mgr *mgr) + struct sxe2_flow_cid_mgr *mgr) { struct sxe2_drv_flow_fnav_query_stat_req req = { 0 }; struct sxe2_drv_flow_fnav_query_stat_resp resp = { 0 }; diff --git a/drivers/net/sxe2/sxe2_cmd_chnl.h b/drivers/net/sxe2/sxe2_cmd_chnl.h index 294ac15db4..cfea1a1f0e 100644 --- a/drivers/net/sxe2/sxe2_cmd_chnl.h +++ b/drivers/net/sxe2/sxe2_cmd_chnl.h @@ -159,7 +159,7 @@ int32_t sxe2_drv_flow_fnav_get_stat_id(struct sxe2_adapter *adapter, uint32_t *s int32_t sxe2_drv_flow_fnav_free_stat(struct sxe2_adapter *adapter, uint32_t stat_id); int32_t sxe2_drv_flow_fnav_query_stat(struct sxe2_adapter *adapter, - struct sxe2_fnav_cid_mgr *mgr); + struct sxe2_flow_cid_mgr *mgr); int32_t sxe2_drv_srcvsi_prune_config(struct sxe2_adapter *adapter, uint16_t *vsi_list, uint16_t vsi_cnt, bool set); diff --git a/drivers/net/sxe2/sxe2_flow.c b/drivers/net/sxe2/sxe2_flow.c index cf54803301..a33b8606df 100644 --- a/drivers/net/sxe2/sxe2_flow.c +++ b/drivers/net/sxe2/sxe2_flow.c @@ -857,7 +857,7 @@ static int32_t sxe2_flow_rte_list_free(struct sxe2_adapter *adapter, struct rte_flow *flow_temp = NULL; struct sxe2_flow *hw_flow = NULL; struct sxe2_flow *hw_flow_temp = NULL; - struct sxe2_fnav_cid_mgr *mgr = NULL; + struct sxe2_flow_cid_mgr *mgr = NULL; rte_spinlock_lock(&adapter->flow_ctxt.flow_list_lock); TAILQ_FOREACH(flow_temp, &adapter->flow_ctxt.rte_flow_list, next) { if (flow_temp == flow) @@ -1028,7 +1028,7 @@ static struct rte_flow *sxe2_flow_create(struct rte_eth_dev *dev, goto l_free_flow; TAILQ_FOREACH(flow, &flow_list->sxe2_flow_list, next) { - ret = sxe2_fnav_get_filter_cid(adapter, flow); + ret = sxe2_flow_get_filter_cid(adapter, flow); if (ret != 0) { PMD_LOG_ERR(DRV, "fnav get stats id failed, ret:%d", ret); rte_flow_error_set(error, EIO, @@ -1088,16 +1088,16 @@ static int32_t sxe2_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *e return ret; } -int32_t sxe2_fnav_get_filter_cid(struct sxe2_adapter *adapter, struct sxe2_flow *flow) +int32_t sxe2_flow_get_filter_cid(struct sxe2_adapter *adapter, struct sxe2_flow *flow) { int32_t ret = 0; - struct sxe2_fnav_cid_mgr_list_t *cid_mgr_list = - &adapter->flow_ctxt.hw_res.fnav_cid_mgr_list; + struct sxe2_flow_cid_mgr_list_t *cid_mgr_list = + &adapter->flow_ctxt.hw_res.flow_cid_mgr_list; uint32_t stat_index; uint32_t user_id; uint32_t driver_id; - struct sxe2_fnav_cid_mgr *temp = NULL; - struct sxe2_fnav_cid_mgr *mgr = NULL; + struct sxe2_flow_cid_mgr *temp = NULL; + struct sxe2_flow_cid_mgr *mgr = NULL; if (sxe2_test_bit(SXE2_FLOW_ACTION_COUNT, flow->action.act_types)) { user_id = flow->action.count.user_id; @@ -1112,7 +1112,7 @@ int32_t sxe2_fnav_get_filter_cid(struct sxe2_adapter *adapter, struct sxe2_flow } if (mgr == NULL) { mgr = rte_zmalloc("sxe2_fnav_cid_mgr", - sizeof(struct sxe2_fnav_cid_mgr), 0); + sizeof(struct sxe2_flow_cid_mgr), 0); if (!mgr) { PMD_LOG_ERR(DRV, "Failed to alloc sxe2vf_fnav_cid_mgr memory."); @@ -1143,13 +1143,13 @@ int32_t sxe2_fnav_get_filter_cid(struct sxe2_adapter *adapter, struct sxe2_flow int32_t sxe2_flow_free_mgr(struct sxe2_adapter *adapter, struct sxe2_flow *flow, - struct sxe2_fnav_cid_mgr **mgr_ptr, + struct sxe2_flow_cid_mgr **mgr_ptr, struct rte_flow_error *error) { int32_t ret = 0; - struct sxe2_fnav_cid_mgr_list_t *cid_mgr_list = - &adapter->flow_ctxt.hw_res.fnav_cid_mgr_list; - struct sxe2_fnav_cid_mgr *mgr = *mgr_ptr; + struct sxe2_flow_cid_mgr_list_t *cid_mgr_list = + &adapter->flow_ctxt.hw_res.flow_cid_mgr_list; + struct sxe2_flow_cid_mgr *mgr = *mgr_ptr; uint32_t user_id = flow->action.count.user_id; if (user_id == 0) { TAILQ_REMOVE(cid_mgr_list, mgr, next); @@ -1170,14 +1170,14 @@ int32_t sxe2_flow_free_mgr(struct sxe2_adapter *adapter, int32_t sxe2_flow_query_mgr(struct sxe2_adapter *adapter, struct sxe2_flow *flow, - struct sxe2_fnav_cid_mgr **mgr_ptr, + struct sxe2_flow_cid_mgr **mgr_ptr, struct rte_flow_error *error) { int32_t ret = 0; - struct sxe2_fnav_cid_mgr_list_t *cid_mgr_list = - &adapter->flow_ctxt.hw_res.fnav_cid_mgr_list; - struct sxe2_fnav_cid_mgr *temp = NULL; - struct sxe2_fnav_cid_mgr *mgr = NULL; + struct sxe2_flow_cid_mgr_list_t *cid_mgr_list = + &adapter->flow_ctxt.hw_res.flow_cid_mgr_list; + struct sxe2_flow_cid_mgr *temp = NULL; + struct sxe2_flow_cid_mgr *mgr = NULL; uint32_t user_id = flow->action.count.user_id; uint32_t driver_id = flow->action.count.driver_id; @@ -1218,7 +1218,7 @@ static int32_t sxe2_flow_query_count(struct sxe2_adapter *adapter, struct rte_flow_error *error) { int32_t ret = 0; - struct sxe2_fnav_cid_mgr *mgr = NULL; + struct sxe2_flow_cid_mgr *mgr = NULL; switch (flow->action.count.stat_ctrl) { case SXE2_FNAV_STAT_ENA_NONE: count->hits_set = 0; @@ -1348,7 +1348,7 @@ int32_t sxe2_flow_init(struct rte_eth_dev *dev) struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(dev); int32_t ret = 0; TAILQ_INIT(&adapter->flow_ctxt.rte_flow_list); - TAILQ_INIT(&adapter->flow_ctxt.hw_res.fnav_cid_mgr_list); + TAILQ_INIT(&adapter->flow_ctxt.hw_res.flow_cid_mgr_list); if (adapter->devargs.fnav_stat_type) adapter->flow_ctxt.hw_res.count_type = adapter->devargs.fnav_stat_type; @@ -1370,10 +1370,10 @@ int32_t sxe2_flow_uninit(struct rte_eth_dev *dev) int32_t ret = 0; struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(dev); struct rte_flow_error error; - struct sxe2_fnav_cid_mgr *mgr = NULL; - struct sxe2_fnav_cid_mgr *temp = NULL; - struct sxe2_fnav_cid_mgr_list_t *cid_mgr_list = - &adapter->flow_ctxt.hw_res.fnav_cid_mgr_list; + struct sxe2_flow_cid_mgr *mgr = NULL; + struct sxe2_flow_cid_mgr *temp = NULL; + struct sxe2_flow_cid_mgr_list_t *cid_mgr_list = + &adapter->flow_ctxt.hw_res.flow_cid_mgr_list; ret = sxe2_flow_flush(dev, &error); if (ret) diff --git a/drivers/net/sxe2/sxe2_flow.h b/drivers/net/sxe2/sxe2_flow.h index daaeedd4dc..8d47b11ff4 100644 --- a/drivers/net/sxe2/sxe2_flow.h +++ b/drivers/net/sxe2/sxe2_flow.h @@ -14,16 +14,16 @@ int32_t sxe2_flow_init(struct rte_eth_dev *dev); int32_t sxe2_flow_uninit(struct rte_eth_dev *dev); -int32_t sxe2_fnav_get_filter_cid(struct sxe2_adapter *adapter, struct sxe2_flow *flow); +int32_t sxe2_flow_get_filter_cid(struct sxe2_adapter *adapter, struct sxe2_flow *flow); int32_t sxe2_flow_free_mgr(struct sxe2_adapter *adapter, struct sxe2_flow *flow, - struct sxe2_fnav_cid_mgr **mgr_ptr, + struct sxe2_flow_cid_mgr **mgr_ptr, struct rte_flow_error *error); int32_t sxe2_flow_query_mgr(struct sxe2_adapter *adapter, struct sxe2_flow *flow, - struct sxe2_fnav_cid_mgr **mgr_ptr, + struct sxe2_flow_cid_mgr **mgr_ptr, struct rte_flow_error *error); int32_t sxe2_flow_init_udp_tunnel_port(struct rte_eth_dev *dev); diff --git a/drivers/net/sxe2/sxe2_flow_define.h b/drivers/net/sxe2/sxe2_flow_define.h index 263a573f04..8a5d871978 100644 --- a/drivers/net/sxe2/sxe2_flow_define.h +++ b/drivers/net/sxe2/sxe2_flow_define.h @@ -98,8 +98,8 @@ struct rte_flow { }; TAILQ_HEAD(rte_flow_list_t, rte_flow); -struct sxe2_fnav_cid_mgr { - TAILQ_ENTRY(sxe2_fnav_cid_mgr) next; +struct sxe2_flow_cid_mgr { + TAILQ_ENTRY(sxe2_flow_cid_mgr) next; uint16_t stat_index; uint32_t user_id; uint32_t driver_id; @@ -107,18 +107,18 @@ struct sxe2_fnav_cid_mgr { uint64_t hits; uint64_t bytes; }; -TAILQ_HEAD(sxe2_fnav_cid_mgr_list_t, sxe2_fnav_cid_mgr); +TAILQ_HEAD(sxe2_flow_cid_mgr_list_t, sxe2_flow_cid_mgr); -struct sxe2_fnav_count_resource { +struct sxe2_flow_count_resource { uint32_t count_type; uint32_t global_index; - struct sxe2_fnav_cid_mgr_list_t fnav_cid_mgr_list; + struct sxe2_flow_cid_mgr_list_t flow_cid_mgr_list; }; struct sxe2_flow_context { struct rte_flow_list_t rte_flow_list; rte_spinlock_t flow_list_lock; - struct sxe2_fnav_count_resource hw_res; + struct sxe2_flow_count_resource hw_res; uint16_t tunnel_port_list[SXE2_FLOW_UDP_TUNNEL_MAX]; uint32_t fnav_inited; }; -- 2.52.0
