diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-02-15 11:59:04 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-02-15 12:38:16 +0000 |
| commit | 07510dd1a812fe064c8d44dd25e6c8a598a709cf (patch) | |
| tree | c04ea244f766a4c3cd621473febfd0ef0f2d6b9c /src/plugins/dpdk/device | |
| parent | a43ccaefc3bd50c03c90f7c3bee02eac9709df56 (diff) | |
dpdk: add support for DPDK 18.02, deprecate 17.08
17.11 is still default.
Change-Id: I524d232579db8a59c717c5d760398b6b7f811d03
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/dpdk/device')
| -rw-r--r-- | src/plugins/dpdk/device/dpdk.h | 6 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/format.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 5313a248428..4f4a2e590b2 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -39,9 +39,7 @@ #include <rte_eth_bond.h> #include <rte_sched.h> #include <rte_net.h> -#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 0) #include <rte_bus_pci.h> -#endif #include <vnet/unix/pcap.h> #include <vnet/devices/devices.h> @@ -119,11 +117,7 @@ typedef struct u64 tx_tail; } tx_ring_hdr_t; -#if RTE_VERSION < RTE_VERSION_NUM(17, 11, 0, 0) -typedef uint8_t dpdk_portid_t; -#else typedef uint16_t dpdk_portid_t; -#endif typedef struct { diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c index d9ee2bd2b83..d661fa72f1c 100644 --- a/src/plugins/dpdk/device/format.c +++ b/src/plugins/dpdk/device/format.c @@ -79,10 +79,6 @@ _(DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, "outer-ipv4-cksum") \ _(DEV_TX_OFFLOAD_QINQ_INSERT, "qinq-insert") -#if RTE_VERSION < RTE_VERSION_NUM(17, 11, 0, 0) -#define PKT_RX_VLAN PKT_RX_VLAN_PKT -#endif - #define foreach_dpdk_pkt_rx_offload_flag \ _ (PKT_RX_VLAN, "RX packet is a 802.1q VLAN packet") \ _ (PKT_RX_RSS_HASH, "RX packet with RSS hash result") \ |