From 174db36812fbdf5bfb08d203b364f8e92a454060 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 18 Oct 2020 15:15:23 +0300 Subject: [PATCH] ethdev: rename tunnel flow offload callbacks Rename new rte_flow ops callbacks to emphasize relation to tunnel offload API. Signed-off-by: Gregory Etelson Acked-by: Ori Kam Acked-by: Ferruh Yigit Acked-by: Ray Kinsella --- lib/librte_ethdev/rte_flow.c | 13 +++++++------ lib/librte_ethdev/rte_flow_driver.h | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 380c5cae2c..d3e5cbc194 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -1223,10 +1223,11 @@ rte_flow_tunnel_action_decap_release(uint16_t port_id, if (unlikely(!ops)) return -rte_errno; - if (likely(!!ops->action_release)) { + if (likely(!!ops->tunnel_action_decap_release)) { return flow_err(port_id, - ops->action_release(dev, actions, - num_of_actions, error), + ops->tunnel_action_decap_release(dev, actions, + num_of_actions, + error), error); } return rte_flow_error_set(error, ENOTSUP, @@ -1245,10 +1246,10 @@ rte_flow_tunnel_item_release(uint16_t port_id, if (unlikely(!ops)) return -rte_errno; - if (likely(!!ops->item_release)) { + if (likely(!!ops->tunnel_item_release)) { return flow_err(port_id, - ops->item_release(dev, items, - num_of_items, error), + ops->tunnel_item_release(dev, items, + num_of_items, error), error); } return rte_flow_error_set(error, ENOTSUP, diff --git a/lib/librte_ethdev/rte_flow_driver.h b/lib/librte_ethdev/rte_flow_driver.h index bd5ffc0bb1..f3d72827cc 100644 --- a/lib/librte_ethdev/rte_flow_driver.h +++ b/lib/librte_ethdev/rte_flow_driver.h @@ -152,13 +152,13 @@ struct rte_flow_ops { struct rte_flow_restore_info *info, struct rte_flow_error *err); /** See rte_flow_action_tunnel_decap_release() */ - int (*action_release) + int (*tunnel_action_decap_release) (struct rte_eth_dev *dev, struct rte_flow_action *pmd_actions, uint32_t num_of_actions, struct rte_flow_error *err); /** See rte_flow_item_release() */ - int (*item_release) + int (*tunnel_item_release) (struct rte_eth_dev *dev, struct rte_flow_item *pmd_items, uint32_t num_of_items, -- 2.20.1