diff --git a/include/odp/api/spec/packet_io_types.h b/include/odp/api/spec/packet_io_types.h index 273deac049..1852413e4e 100644 --- a/include/odp/api/spec/packet_io_types.h +++ b/include/odp/api/spec/packet_io_types.h @@ -13,7 +13,6 @@ #define ODP_API_SPEC_PACKET_IO_TYPES_H_ #include -#include #include #include #include @@ -538,14 +537,6 @@ typedef union odp_pktout_config_opt_t { */ uint64_t aging_ena : 1; - /** - * For backwards compatibility, setting this flag is the same as setting - * tx_compl.mode_event in odp_pktio_config_t. The default value is zero. - * - * @deprecated Use odp_pktio_config_t::mode_event instead. - */ - uint64_t ODP_DEPRECATE(tx_compl_ena) : 1; - /** Enable packet protocol stats update */ uint64_t proto_stats_ena : 1; @@ -1126,13 +1117,6 @@ typedef struct odp_pktio_capability_t { */ odp_bool_t queue_type_plain; - /** - * For backwards compatibility, mode_all is synonym of mode_event. - * - * @deprecated Use mode_event instead. - */ - uint32_t ODP_DEPRECATE(mode_all) : 1; - /** Packet transmit completion mode ODP_PACKET_TX_COMPL_EVENT support */ uint32_t mode_event : 1; diff --git a/include/odp/api/spec/packet_types.h b/include/odp/api/spec/packet_types.h index a9de69b4cb..5476a00da9 100644 --- a/include/odp/api/spec/packet_types.h +++ b/include/odp/api/spec/packet_types.h @@ -13,7 +13,6 @@ #define ODP_API_SPEC_PACKET_TYPES_H_ #include -#include #include #include @@ -505,15 +504,6 @@ typedef enum odp_packet_tx_compl_mode_t { } odp_packet_tx_compl_mode_t; -/** - * For backwards compatibility, ODP_PACKET_TX_COMPL_ALL is synonym of ODP_PACKET_TX_COMPL_EVENT. - * - * @deprecated Use #ODP_PACKET_TX_COMPL_EVENT instead. - */ -#if ODP_DEPRECATED_API -#define ODP_PACKET_TX_COMPL_ALL ODP_PACKET_TX_COMPL_EVENT -#endif - /** * Packet transmit completion request options */ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index dcb4155fa0..4bb93ac6eb 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -652,13 +651,10 @@ 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.ODP_DEPRECATE(tx_compl_ena) || - config->tx_compl.mode_event || - config->tx_compl.mode_poll); + entry->enabled.tx_compl = (config->tx_compl.mode_event || config->tx_compl.mode_poll); if (entry->enabled.tx_compl) { - if ((config->pktout.bit.ODP_DEPRECATE(tx_compl_ena) || - config->tx_compl.mode_event) && configure_tx_event_compl(entry)) { + if (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 index 855f1335e2..53259f6f66 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -1768,10 +1767,6 @@ static int dpdk_init_capability(pktio_entry_t *pktio_entry, capa->config.pktout.bit.ts_ena = 1; if (!_ODP_DPDK_ZERO_COPY) { -#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; capa->tx_compl.mode_poll = 1; capa->free_ctrl.dont_free = 1; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index ef3adc2d3b..012291a10b 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -3,7 +3,6 @@ * Copyright (c) 2019-2022 Nokia */ -#include #include #include #include @@ -920,10 +919,7 @@ static int ipc_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_capab capa->max_input_queues = 1; capa->max_output_queues = 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; capa->tx_compl.mode_poll = 1; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index f683fa434c..ee4fa63cc5 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -4,7 +4,6 @@ */ #include -#include #include #include #include @@ -696,10 +695,7 @@ 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; -#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; capa->tx_compl.mode_poll = 1; diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c index 3a07ab77d5..9442e2beef 100644 --- a/platform/linux-generic/pktio/null.c +++ b/platform/linux-generic/pktio/null.c @@ -4,7 +4,6 @@ */ #include -#include #include #include @@ -138,10 +137,7 @@ 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; -#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; capa->tx_compl.mode_poll = 1; diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 9a3ee35fa6..368ffe0cff 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -506,10 +505,7 @@ 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; -#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; capa->tx_compl.mode_poll = 1; diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 29fff1cf0c..c3384f2e5b 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -586,10 +585,7 @@ static int sock_capability(pktio_entry_t *pktio_entry, capa->config.pktin.bit.ts_ptp = 1; capa->config.pktout.bit.ts_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; capa->tx_compl.mode_poll = 1; diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index cd56f34325..d0d890899e 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -890,10 +889,7 @@ static int sock_mmap_capability(pktio_entry_t *pktio_entry, capa->config.pktin.bit.ts_ptp = 1; capa->config.pktout.bit.ts_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; capa->tx_compl.mode_poll = 1; diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 6fc7e95131..03fb866fa9 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -535,10 +534,7 @@ 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; -#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; capa->tx_compl.mode_poll = 1; diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index e03d44ddc6..c112c11ced 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -3846,10 +3846,7 @@ static void pktio_test_pktout_compl_event(bool use_plain_queue, uint32_t test_fl /* Configure Tx completion offload for PKTIO Tx */ if (i == 0) { CU_ASSERT_FATAL(pktio_capa.tx_compl.mode_event == 1); -#if ODP_DEPRECATED_API - CU_ASSERT_FATAL(pktio_capa.tx_compl.mode_all == - pktio_capa.tx_compl.mode_event); -#endif + if (use_plain_queue) { CU_ASSERT_FATAL(pktio_capa.tx_compl.queue_type_plain != 0); } else { @@ -3884,13 +3881,10 @@ static void pktio_test_pktout_compl_event(bool use_plain_queue, uint32_t test_fl /* Disabled by default */ CU_ASSERT(odp_packet_has_tx_compl_request(pkt_tbl[0]) == 0); - /* Check that disable works. Also COMPL_ALL should be still supported. */ + /* Check that disable works */ opt.queue = compl_queue[0]; -#if ODP_DEPRECATED_API - opt.mode = ODP_PACKET_TX_COMPL_ALL; -#else opt.mode = ODP_PACKET_TX_COMPL_EVENT; -#endif + odp_packet_tx_compl_request(pkt_tbl[0], &opt); CU_ASSERT(odp_packet_has_tx_compl_request(pkt_tbl[0]) != 0); opt.mode = ODP_PACKET_TX_COMPL_DISABLED;