diff options
| author |   Dastin Wilski <dastin.wilski@gmail.com> | 2022-03-30 14:15:56 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2022-04-05 16:16:30 +0000 |
| commit | 3a183dbe452763442ca8c985a75f03aabe11a479 (patch) | |
| tree | f02f6bdc2291439d88288b9107cb3a3093440f23 /src/plugins/dpdk/device/device.c | |
| parent | c233bc3581e33c819466f2248eb7218b87b54bd2 (diff) | |
dpdk: macros changes for dpdk 22.03
New dpdk version deprecates some macros used by VPP.
This patch changes them to 22.03 version.
Type: improvement
Signed-off-by: Dastin Wilski <dastin.wilski@gmail.com>
Change-Id: Ic362ed318dc1ad88bb682ef13fbd6159171fbaef
Diffstat (limited to 'src/plugins/dpdk/device/device.c')
| -rw-r--r-- | src/plugins/dpdk/device/device.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index fa19f5c8457..b6a048e8ab9 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -547,7 +547,7 @@ dpdk_subif_add_del_function (vnet_main_t * vnm, } vlan_offload = rte_eth_dev_get_vlan_offload (xd->port_id); - vlan_offload |= ETH_VLAN_FILTER_OFFLOAD; + vlan_offload |= RTE_ETH_VLAN_FILTER_OFFLOAD; if ((r = rte_eth_dev_set_vlan_offload (xd->port_id, vlan_offload))) { @@ -647,10 +647,8 @@ dpdk_interface_set_rss_queues (struct vnet_main_t *vnm, } /* update reta table */ - reta_conf = - (struct rte_eth_rss_reta_entry64 *) clib_mem_alloc (dev_info.reta_size / - RTE_RETA_GROUP_SIZE * - sizeof (*reta_conf)); + reta_conf = (struct rte_eth_rss_reta_entry64 *) clib_mem_alloc ( + dev_info.reta_size / RTE_ETH_RETA_GROUP_SIZE * sizeof (*reta_conf)); if (reta_conf == NULL) { err = clib_error_return (0, "clib_mem_alloc failed"); @@ -658,13 +656,13 @@ dpdk_interface_set_rss_queues (struct vnet_main_t *vnm, } clib_memset (reta_conf, 0, - dev_info.reta_size / RTE_RETA_GROUP_SIZE * - sizeof (*reta_conf)); + dev_info.reta_size / RTE_ETH_RETA_GROUP_SIZE * + sizeof (*reta_conf)); for (i = 0; i < dev_info.reta_size; i++) { - uint32_t reta_id = i / RTE_RETA_GROUP_SIZE; - uint32_t reta_pos = i % RTE_RETA_GROUP_SIZE; + uint32_t reta_id = i / RTE_ETH_RETA_GROUP_SIZE; + uint32_t reta_pos = i % RTE_ETH_RETA_GROUP_SIZE; reta_conf[reta_id].mask = UINT64_MAX; reta_conf[reta_id].reta[reta_pos] = reta[i]; |