api: pktio: explicitly deprecate odp_pktout_config_opt_t.bit.tx_compl…

…_ena Explicitly deprecate odp_pktout_config_opt_t.bit.tx_compl_ena field. Signed-off-by: Matias Elo <[email protected]> Reviewed-by: Petri Savolainen <[email protected]> Reviewed-by: Jerin Jacob <[email protected]>
OpenDataPlane · Dec 20, 2024 · a71ff95 · a71ff95
1 parent c5f7e00
commit a71ff95
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/include/odp/api/spec/packet_io_types.h b/include/odp/api/spec/packet_io_types.h
@@ -534,7 +534,7 @@ typedef union odp_pktout_config_opt_t {
 		 *
 		 * @deprecated Use odp_pktio_config_t::mode_event instead.
 		 */
-		uint64_t tx_compl_ena : 1;
+		uint64_t ODP_DEPRECATE(tx_compl_ena) : 1;
 
 		/** Enable packet protocol stats update */
 		uint64_t proto_stats_ena : 1;

diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
@@ -7,6 +7,7 @@
 
 #include <odp/api/buffer.h>
 #include <odp/api/debug.h>
+#include <odp/api/deprecated.h>
 #include <odp/api/packet.h>
 #include <odp/api/packet_io.h>
 #include <odp/api/proto_stats.h>
@@ -650,13 +651,13 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config)
 	entry->config = *config;
 
 	entry->enabled.tx_ts = config->pktout.bit.ts_ena;
-	entry->enabled.tx_compl = (config->pktout.bit.tx_compl_ena ||
+	entry->enabled.tx_compl = (config->pktout.bit.ODP_DEPRECATE(tx_compl_ena) ||
 				   config->tx_compl.mode_event ||
 				   config->tx_compl.mode_poll);
 
 	if (entry->enabled.tx_compl) {
-		if ((config->pktout.bit.tx_compl_ena || config->tx_compl.mode_event) &&
-		    configure_tx_event_compl(entry)) {
+		if ((config->pktout.bit.ODP_DEPRECATE(tx_compl_ena) ||
+		     config->tx_compl.mode_event) && configure_tx_event_compl(entry)) {
 			unlock_entry(entry);
 			_ODP_ERR("Unable to configure Tx event completion\n");
 			return -1;

diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
@@ -1775,8 +1775,8 @@ static int dpdk_init_capability(pktio_entry_t *pktio_entry,
 	capa->config.pktout.bit.ts_ena = 1;
 
 	if (!_ODP_DPDK_ZERO_COPY) {
-		capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+		capa->config.pktout.bit.tx_compl_ena = 1;
 		capa->tx_compl.mode_all = 1;
 #endif
 		capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
@@ -922,8 +922,8 @@ static int ipc_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_capab
 
 	capa->max_input_queues  = 1;
 	capa->max_output_queues = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
@@ -673,8 +673,8 @@ static int loopback_init_capability(pktio_entry_t *pktio_entry)
 	capa->config.pktout.bit.udp_chksum = 1;
 	capa->config.pktout.bit.sctp_chksum = 1;
 	capa->config.pktout.bit.ts_ena = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c
@@ -138,8 +138,8 @@ static int null_capability(pktio_entry_t *pktio_entry ODP_UNUSED,
 	capa->config.pktin.bit.ts_ptp = 1;
 
 	capa->config.pktout.bit.ts_ena = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
@@ -506,8 +506,8 @@ static int pcapif_capability(pktio_entry_t *pktio_entry ODP_UNUSED,
 	capa->config.pktin.bit.ts_ptp = 1;
 
 	capa->config.pktout.bit.ts_ena = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
@@ -586,8 +586,8 @@ static int sock_capability(pktio_entry_t *pktio_entry,
 	capa->config.pktin.bit.ts_ptp = 1;
 
 	capa->config.pktout.bit.ts_ena = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
@@ -890,8 +890,8 @@ static int sock_mmap_capability(pktio_entry_t *pktio_entry,
 	capa->config.pktin.bit.ts_ptp = 1;
 
 	capa->config.pktout.bit.ts_ena = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;

diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
@@ -535,8 +535,8 @@ static int tap_capability(pktio_entry_t *pktio_entry ODP_UNUSED,
 	capa->config.pktin.bit.ts_ptp = 1;
 
 	capa->config.pktout.bit.ts_ena = 1;
-	capa->config.pktout.bit.tx_compl_ena = 1;
 #if ODP_DEPRECATED_API
+	capa->config.pktout.bit.tx_compl_ena = 1;
 	capa->tx_compl.mode_all = 1;
 #endif
 	capa->tx_compl.mode_event = 1;