From f7c379403a98cf060d28bac24916c51067c4ec90 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 28 Feb 2017 23:26:30 +0100 Subject: dpdk: retire support for dpdk 16.07 Change-Id: I8585552c026415340fe9fd0458cb8450da3c4ae2 Signed-off-by: Damjan Marion --- src/vnet/devices/dpdk/node.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/vnet/devices/dpdk/node.c') diff --git a/src/vnet/devices/dpdk/node.c b/src/vnet/devices/dpdk/node.c index e541cdbcbd2..bde9dfae76d 100644 --- a/src/vnet/devices/dpdk/node.c +++ b/src/vnet/devices/dpdk/node.c @@ -55,11 +55,6 @@ vlib_buffer_is_mpls (vlib_buffer_t * b) return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST)); } -#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0) -/* New ol_flags bits added in DPDK-16.11 */ -#define PKT_RX_IP_CKSUM_GOOD (1ULL << 7) -#endif - always_inline u32 dpdk_rx_next_from_etype (struct rte_mbuf * mb, vlib_buffer_t * b0) { @@ -79,15 +74,8 @@ dpdk_rx_next_from_etype (struct rte_mbuf * mb, vlib_buffer_t * b0) always_inline int dpdk_mbuf_is_vlan (struct rte_mbuf *mb) { -#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0) return (mb->packet_type & RTE_PTYPE_L2_ETHER_VLAN) == RTE_PTYPE_L2_ETHER_VLAN; -#else - return - (mb->ol_flags & - (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ_STRIPPED)) == - PKT_RX_VLAN_PKT; -#endif } always_inline int -- cgit 1.2.3-korg