From d4f88cc0967ea1de66396ac07b20cf6e33a3fa1a Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 5 Jan 2022 01:52:38 +0100 Subject: interface: refactor interface capabilities code Make it shorter to type, easier to debug, make adding callbacks in future simpler. Type: improvement Change-Id: I6cdd6375e36da23bd452a7c7273ff42789e94433 Signed-off-by: Damjan Marion --- src/plugins/dpdk/device/common.c | 4 ++-- src/plugins/dpdk/device/init.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/plugins/dpdk/device') diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c index ce91df59868..b0aaaaf9d47 100644 --- a/src/plugins/dpdk/device/common.c +++ b/src/plugins/dpdk/device/common.c @@ -212,7 +212,7 @@ dpdk_setup_interrupts (dpdk_device_t *xd) if (xd->flags & DPDK_DEVICE_FLAG_INT_SUPPORTED) { - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_INT_MODE; + hi->caps |= VNET_HW_IF_CAP_INT_MODE; for (int q = 0; q < xd->conf.n_rx_queues; q++) { dpdk_rx_queue_t *rxq = vec_elt_at_index (xd->rx_queues, q); @@ -221,7 +221,7 @@ dpdk_setup_interrupts (dpdk_device_t *xd) if (rxq->efd < 0) { xd->flags &= ~DPDK_DEVICE_FLAG_INT_SUPPORTED; - hi->caps &= ~VNET_HW_INTERFACE_CAP_SUPPORTS_INT_MODE; + hi->caps &= ~VNET_HW_IF_CAP_INT_MODE; break; } f.read_function = dpdk_rx_read_ready; diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index e2c919428f2..80d85a856de 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -801,7 +801,7 @@ dpdk_lib_init (dpdk_main_t * dm) /* Indicate ability to support L3 DMAC filtering and * initialize interface to L3 non-promisc mode */ - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_MAC_FILTER; + hi->caps |= VNET_HW_IF_CAP_MAC_FILTER; ethernet_set_flags (vnm, xd->hw_if_index, ETHERNET_INTERFACE_FLAG_DEFAULT_L3); } @@ -809,22 +809,22 @@ dpdk_lib_init (dpdk_main_t * dm) if (xd->conf.no_tx_checksum_offload == 0) if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD && hi != NULL) { - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_TX_IP4_CKSUM | - VNET_HW_INTERFACE_CAP_SUPPORTS_TX_TCP_CKSUM | - VNET_HW_INTERFACE_CAP_SUPPORTS_TX_UDP_CKSUM; + hi->caps |= VNET_HW_IF_CAP_TX_IP4_CKSUM | + VNET_HW_IF_CAP_TX_TCP_CKSUM | + VNET_HW_IF_CAP_TX_UDP_CKSUM; if (xd->conf.enable_outer_checksum_offload) { - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_TX_IP4_OUTER_CKSUM | - VNET_HW_INTERFACE_CAP_SUPPORTS_TX_UDP_OUTER_CKSUM; + hi->caps |= VNET_HW_IF_CAP_TX_IP4_OUTER_CKSUM | + VNET_HW_IF_CAP_TX_UDP_OUTER_CKSUM; } } if (devconf->tso == DPDK_DEVICE_TSO_ON && hi != NULL) { /*tcp_udp checksum must be enabled*/ if ((xd->conf.enable_tcp_udp_checksum) && - (hi->caps & VNET_HW_INTERFACE_CAP_SUPPORTS_TX_CKSUM)) + (hi->caps & VNET_HW_IF_CAP_TX_CKSUM)) { - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_TCP_GSO; + hi->caps |= VNET_HW_IF_CAP_TCP_GSO; xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_TSO; if (xd->conf.enable_outer_checksum_offload && @@ -832,7 +832,7 @@ dpdk_lib_init (dpdk_main_t * dm) { xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_VXLAN_TNL_TSO; - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_VXLAN_TNL_GSO; + hi->caps |= VNET_HW_IF_CAP_VXLAN_TNL_GSO; } } else -- cgit 1.2.3-korg