From 5ca820390718e9242d0abed8d173f6bde31dec8f Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Fri, 31 Aug 2018 11:01:13 +0200 Subject: [PATCH] ethdev: deprecate flow object copy function No users left for this function, time to deprecate it. Signed-off-by: Adrien Mazarguil Acked-by: Nelio Laranjeiro --- doc/guides/rel_notes/deprecation.rst | 7 ------- lib/librte_ethdev/rte_flow.h | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index d2aec64d16..9f825f09e6 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -67,10 +67,3 @@ Deprecation Notices - ``rte_pdump_set_socket_dir`` will be removed; - The parameter, ``path``, of ``rte_pdump_init`` will be removed; - The enum ``rte_pdump_socktype`` will be removed. - -* ethdev: flow API function ``rte_flow_copy()`` will be deprecated in v18.11 - in favor of ``rte_flow_conv()`` (which will appear in that version) and - subsequently removed for v19.02. - - This is due to a lack of flexibility and reliance on a type unusable with - C++ programs (struct rte_flow_desc). diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index 052ceefb61..f062ffead9 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -2332,6 +2332,7 @@ rte_flow_error_set(struct rte_flow_error *error, const char *message); /** + * @deprecated * @see rte_flow_copy() */ struct rte_flow_desc { @@ -2343,10 +2344,13 @@ struct rte_flow_desc { }; /** + * @deprecated * Copy an rte_flow rule description. * * This interface is kept for compatibility with older applications but is - * implemented as a wrapper to rte_flow_conv(). + * implemented as a wrapper to rte_flow_conv(). It is deprecated due to its + * lack of flexibility and reliance on a type unusable with C++ programs + * (struct rte_flow_desc). * * @param[in] fd * Flow rule description. @@ -2365,6 +2369,7 @@ struct rte_flow_desc { * If len is lower than the size of the flow, the number of bytes that would * have been written to desc had it been sufficient. Nothing is written. */ +__rte_deprecated size_t rte_flow_copy(struct rte_flow_desc *fd, size_t len, const struct rte_flow_attr *attr, -- 2.20.1