From: Jingjing Wu Date: Sat, 21 Feb 2015 01:53:10 +0000 (+0000) Subject: ethdev: remove old flex filter API X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=942524d60545bb007597246953a26b7c3d8d99d0;p=dpdk.git ethdev: remove old flex filter API Structure rte_flex_filter is removed. Following APIs are removed: - rte_eth_dev_add_flex_filter - rte_eth_dev_remove_flex_filter - rte_eth_dev_get_flex_filter Signed-off-by: Jingjing Wu [Thomas: remove also from version map] --- diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 17be2f3673..ccff0ef704 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -3176,57 +3176,6 @@ rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index, rx_queue); } -int -rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t rx_queue) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_flex_filter, -ENOTSUP); - return (*dev->dev_ops->add_flex_filter)(dev, index, filter, rx_queue); -} - -int -rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_flex_filter, -ENOTSUP); - return (*dev->dev_ops->remove_flex_filter)(dev, index); -} - -int -rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t *rx_queue) -{ - struct rte_eth_dev *dev; - - if (filter == NULL || rx_queue == NULL) - return -EINVAL; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_flex_filter, -ENOTSUP); - return (*dev->dev_ops->get_flex_filter)(dev, index, filter, - rx_queue); -} - int rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type) { diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 526a9a4f56..eeffeeea09 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -994,17 +994,6 @@ struct rte_2tuple_filter { protocol_mask:1; }; -/** - * A structure used to define a flex filter. - */ -struct rte_flex_filter { - uint16_t len; - uint32_t dwords[32]; /**< flex bytes in big endian. */ - uint8_t mask[16]; /**< if mask bit is 1b, do not compare - corresponding byte in dwords. */ - uint8_t priority; -}; - /** * A structure used to define a 5tuple filter. */ @@ -1398,20 +1387,6 @@ typedef int (*eth_get_5tuple_filter_t)(struct rte_eth_dev *dev, uint16_t *rx_queue); /**< @internal Get a 5tuple filter rule on an Ethernet device */ -typedef int (*eth_add_flex_filter_t)(struct rte_eth_dev *dev, - uint16_t index, struct rte_flex_filter *filter, - uint16_t rx_queue); -/**< @internal Setup a new flex filter rule on an Ethernet device */ - -typedef int (*eth_remove_flex_filter_t)(struct rte_eth_dev *dev, - uint16_t index); -/**< @internal Remove a flex filter rule on an Ethernet device */ - -typedef int (*eth_get_flex_filter_t)(struct rte_eth_dev *dev, - uint16_t index, struct rte_flex_filter *filter, - uint16_t *rx_queue); -/**< @internal Get a flex filter rule on an Ethernet device */ - typedef int (*eth_filter_ctrl_t)(struct rte_eth_dev *dev, enum rte_filter_type filter_type, enum rte_filter_op filter_op, @@ -1523,9 +1498,6 @@ struct eth_dev_ops { eth_add_5tuple_filter_t add_5tuple_filter; /**< add 5tuple filter. */ eth_remove_5tuple_filter_t remove_5tuple_filter; /**< remove 5tuple filter. */ eth_get_5tuple_filter_t get_5tuple_filter; /**< get 5tuple filter. */ - eth_add_flex_filter_t add_flex_filter; /**< add flex filter. */ - eth_remove_flex_filter_t remove_flex_filter; /**< remove flex filter. */ - eth_get_flex_filter_t get_flex_filter; /**< get flex filter. */ eth_filter_ctrl_t filter_ctrl; /**< common filter control*/ }; @@ -3577,67 +3549,6 @@ int rte_eth_dev_remove_5tuple_filter(uint8_t port_id, uint16_t index); int rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index, struct rte_5tuple_filter *filter, uint16_t *rx_queue); -/** - * Add a new flex filter rule on an Ethernet device. - * - * @param port_id - * The port identifier of the Ethernet device. - * @param index - * The identifier of flex filter. - * @param filter - * The pointer to the structure describing the flex filter rule. - * The *rte_flex_filter* structure includes the values of the different fields - * to match: the dwords (first len bytes of packet ) and relative masks. - * @param rx_queue - * The index of the RX queue where to store RX packets matching the added - * flex filter. - * @return - * - (0) if successful. - * - (-ENOTSUP) if hardware doesn't support flex filter. - * - (-ENODEV) if *port_id* invalid. - * - (-EINVAL) if the filter information is not correct. - * - (-ENOENT) if no enabled filter in this index. - */ -int rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t rx_queue); - -/** - * remove a flex filter rule on an Ethernet device. - * - * @param port_id - * The port identifier of the Ethernet device. - * @param index - * The identifier of flex filter. - * @return - * - (0) if successful. - * - (-ENOTSUP) if hardware doesn't support flex filter. - * - (-ENODEV) if *port_id* invalid. - * - (-EINVAL) if the filter information is not correct. - */ -int rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index); - -/** - * Get an flex filter rule on an Ethernet device. - * - * @param port_id - * The port identifier of the Ethernet device. - * @param index - * The identifier of flex filter. - * @param filter - * A pointer to a structure of type *rte_flex_filter* to be filled with - * the information of the flex filter. - * @param rx_queue - * A pointer to get the queue index. - * @return - * - (0) if successful. - * - (-ENOTSUP) if hardware doesn't support flex filter. - * - (-ENODEV) if *port_id* invalid. - * - (-EINVAL) if the filter information is not correct. - * - (-ENOENT) if no enabled filter in this index. - */ -int rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t *rx_queue); - /** * Check whether the filter type is supported on an Ethernet device. * All the supported filter types are defined in 'rte_eth_ctrl.h'. diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index 7316530156..75883b461b 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -8,7 +8,6 @@ DPDK_2.0 { rte_eth_dev_add_2tuple_filter; rte_eth_dev_add_5tuple_filter; rte_eth_dev_add_ethertype_filter; - rte_eth_dev_add_flex_filter; rte_eth_dev_add_syn_filter; rte_eth_dev_allocate; rte_eth_dev_bypass_event_show; @@ -40,7 +39,6 @@ DPDK_2.0 { rte_eth_dev_get_2tuple_filter; rte_eth_dev_get_5tuple_filter; rte_eth_dev_get_ethertype_filter; - rte_eth_dev_get_flex_filter; rte_eth_dev_get_mtu; rte_eth_dev_get_syn_filter; rte_eth_dev_get_vlan_offload; @@ -51,7 +49,6 @@ DPDK_2.0 { rte_eth_dev_remove_2tuple_filter; rte_eth_dev_remove_5tuple_filter; rte_eth_dev_remove_ethertype_filter; - rte_eth_dev_remove_flex_filter; rte_eth_dev_remove_syn_filter; rte_eth_dev_rss_hash_conf_get; rte_eth_dev_rss_hash_update;