diff options
| -rw-r--r-- | src/plugins/dpdk/device/init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index c811c4736d0..bb761c09c61 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -46,6 +46,7 @@ dpdk_config_main_t dpdk_config_main; /* Port configuration, mildly modified Intel app values */ +#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) static struct rte_eth_conf port_conf_template = { .rxmode = { .split_hdr_size = 0, @@ -54,6 +55,7 @@ static struct rte_eth_conf port_conf_template = { .mq_mode = ETH_MQ_TX_NONE, }, }; +#endif static dpdk_port_type_t port_type_from_speed_capa (struct rte_eth_dev_info *dev_info) @@ -369,8 +371,10 @@ dpdk_lib_init (dpdk_main_t * dm) xd->flags |= DPDK_DEVICE_FLAG_MAYBE_MULTISEG; } +#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) clib_memcpy (&xd->port_conf, &port_conf_template, sizeof (struct rte_eth_conf)); +#endif xd->tx_q_used = clib_min (dev_info.max_tx_queues, tm->n_vlib_mains); @@ -490,7 +494,7 @@ dpdk_lib_init (dpdk_main_t * dm) #if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) xd->port_conf.rxmode.enable_scatter = 0; #else - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_SCATTER; + xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_SCATTER; #endif break; |