diff options
| author | Matias Elo <matias.elo@nokia.com> | 2021-12-16 11:16:39 +0200 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2021-12-16 11:16:39 +0200 |
| commit | d4ce9709392685d1b837f410d57846bea037efee (patch) | |
| tree | f29566d7f34c5e938205b875c01deb81dad40f38 /platform/linux-generic/pktio | |
| parent | 2ed1489ccc354300037bad2e718fe63cd6fdd7ba (diff) | |
| parent | d1f5531d0bee1fcc6cd8f247c1fcea20090a5163 (diff) | |
Merge tag 'v1.33.0.0' of https://github.com/OpenDataPlane/odp into odp-dpdk
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'platform/linux-generic/pktio')
| -rw-r--r-- | platform/linux-generic/pktio/dpdk.c | 2 | ||||
| -rw-r--r-- | platform/linux-generic/pktio/ipc.c | 2 | ||||
| -rw-r--r-- | platform/linux-generic/pktio/loop.c | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 36c1ec06e..a0407ca62 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -305,7 +305,7 @@ static void pktmbuf_init(struct rte_mempool *mp, void *opaque_arg ODP_UNUSED, void *buf_addr; pkt_hdr = pkt_hdr_from_mbuf(m); - buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM; + buf_addr = pkt_hdr->event_hdr.base_data - RTE_PKTMBUF_HEADROOM; priv_size = rte_pktmbuf_priv_size(mp); mbuf_size = sizeof(struct rte_mbuf); diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index b89252303..6a78415c5 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -787,7 +787,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, pool_t *pool; pkt_hdr = packet_hdr(pkt); - pool = pkt_hdr->buf_hdr.pool_ptr; + pool = pkt_hdr->event_hdr.pool_ptr; if (pool->pool_idx != ipc_pool->pool_idx || odp_packet_has_ref(pkt)) { diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 666e7ce90..ae6403fe6 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -18,6 +18,7 @@ #include <odp_queue_if.h> #include <odp/api/plat/queue_inlines.h> #include <odp_global_data.h> +#include <odp_event_internal.h> #include <protocols/eth.h> #include <protocols/ip.h> @@ -97,7 +98,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkts[], int num) { int nbr, i; - odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; + _odp_event_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; odp_queue_t queue; odp_packet_hdr_t *pkt_hdr; odp_packet_t pkt; @@ -123,7 +124,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, for (i = 0; i < nbr; i++) { uint32_t pkt_len; - pkt = packet_from_buf_hdr(hdr_tbl[i]); + pkt = packet_from_event_hdr(hdr_tbl[i]); pkt_len = odp_packet_len(pkt); pkt_hdr = packet_hdr(pkt); @@ -297,7 +298,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_tbl[], int num) { pkt_loop_t *pkt_loop = pkt_priv(pktio_entry); - odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; + _odp_event_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; odp_queue_t queue; int i; int ret; @@ -323,7 +324,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } break; } - hdr_tbl[i] = packet_to_buf_hdr(pkt_tbl[i]); + hdr_tbl[i] = packet_to_event_hdr(pkt_tbl[i]); bytes += pkt_len; /* Store cumulative byte counts to update 'stats.out_octets' * correctly in case enq_multi() fails to enqueue all packets. |