From 0e4e5a8222089d6e8f70ad74afcfd4e2854a00da Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Wed, 19 Jan 2022 18:26:43 +0100 Subject: dpdk: fix compilation for DPDK < 21.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Type: fix Change-Id: Ic5b74fb7a8e479e8cdccbb6a564ff3fdd299455c Signed-off-by: Benoît Ganne --- src/plugins/dpdk/device/common.c | 4 ++-- src/plugins/dpdk/device/init.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c index 0f54a616773..df80a85872d 100644 --- a/src/plugins/dpdk/device/common.c +++ b/src/plugins/dpdk/device/common.c @@ -169,8 +169,8 @@ dpdk_device_setup (dpdk_device_t * xd) } else { - mtu = 1500; - xd->max_supported_frame_size = mtu + xd->driver_frame_overhead; + xd->max_supported_frame_size = + clib_min (1500 + xd->driver_frame_overhead, buf_sz); } #else if (xd->conf.disable_multi_seg) diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 6c34981b2a2..09f1e18c9a5 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -390,6 +390,9 @@ dpdk_lib_init (dpdk_main_t * dm) xd->conf.rss_hf); } +#ifndef RTE_VLAN_HLEN +#define RTE_VLAN_HLEN 4 +#endif xd->driver_frame_overhead = RTE_ETHER_HDR_LEN + 2 * RTE_VLAN_HLEN + RTE_ETHER_CRC_LEN; #if RTE_VERSION >= RTE_VERSION_NUM(21, 11, 0, 0) -- cgit 1.2.3-korg