diff options
| author | Matias Elo <matias.elo@nokia.com> | 2022-05-02 12:15:50 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2022-05-25 10:58:00 +0300 |
| commit | 503d3a0197df1b37f836ce02b0e55cc05b468526 (patch) | |
| tree | c8200054d6c09ca2f6ad6dea85f55f38364d2117 /platform | |
| parent | d6f4f732b5477a74ceb5ffd089981b068ea499a6 (diff) | |
Port 76c8b7a1a "linux-gen: parse: remove unused *_packet_parse_layer() functions"
Port original commit from linux-generic. ODP-DPDK specific DPDK pktio
header is no longer required.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linux-dpdk/Makefile.am | 2 | ||||
| -rw-r--r-- | platform/linux-dpdk/include/odp_packet_dpdk.h | 55 |
2 files changed, 1 insertions, 56 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 67d7cee96..70ce4b980 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -128,7 +128,7 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_parse_internal.h \ include/odp_errno_define.h \ include/odp_event_internal.h \ - include/odp_packet_dpdk.h \ + ${top_srcdir}/platform/linux-generic/include/odp_packet_dpdk.h \ ${top_srcdir}/platform/linux-generic/include/odp_pcapng.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ diff --git a/platform/linux-dpdk/include/odp_packet_dpdk.h b/platform/linux-dpdk/include/odp_packet_dpdk.h deleted file mode 100644 index 7bb431fd3..000000000 --- a/platform/linux-dpdk/include/odp_packet_dpdk.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (c) 2018, Linaro Limited - * Copyright (c) 2019, Nokia - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PACKET_DPDK_H_ -#define ODP_PACKET_DPDK_H_ - -#include <odp/api/packet.h> -#include <odp/api/packet_io.h> - -#include <odp/api/plat/packet_inlines.h> - -#include <odp_packet_internal.h> - -#include <stdint.h> - -/* Flags for pkt_dpdk_t.supported_ptypes */ -#define PTYPE_VLAN 0x01 -#define PTYPE_VLAN_QINQ 0x02 -#define PTYPE_ARP 0x04 -#define PTYPE_IPV4 0x08 -#define PTYPE_IPV6 0x10 -#define PTYPE_UDP 0x20 -#define PTYPE_TCP 0x40 - -/** Packet parser using DPDK interface */ -int _odp_dpdk_packet_parse_common(packet_parser_t *prs, - const uint8_t *ptr, - uint32_t pkt_len, - uint32_t seg_len, - struct rte_mbuf *mbuf, - int layer, - uint32_t supported_ptypes, - odp_pktin_config_opt_t pktin_cfg); - -static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - struct rte_mbuf *mbuf, - odp_proto_layer_t layer, - uint32_t supported_ptypes, - odp_pktin_config_opt_t pktin_cfg) -{ - odp_packet_t pkt = packet_handle(pkt_hdr); - uint32_t seg_len = odp_packet_seg_len(pkt); - uint32_t len = odp_packet_len(pkt); - uint8_t *base = odp_packet_data(pkt); - - return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base, len, seg_len, - mbuf, layer, supported_ptypes, - pktin_cfg); -} - -#endif |