From 048acfbd9ee6c0d476ffd87db9c1c744f3040e25 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 29 May 2019 10:00:46 +0200 Subject: dpdk: remove bonding code We have native implementation and we should not maintain both.... Change-Id: Ic09ebffda52cdc733b3cfeff06690e0d3cc08084 Signed-off-by: Damjan Marion --- src/plugins/dpdk/device/dpdk.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/plugins/dpdk/device/dpdk.h') diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index f79465cf8b4..eadf35d5ef6 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -73,7 +72,6 @@ extern vlib_node_registration_t admin_up_down_process_node; _ ("net_enic", ENIC) \ _ ("net_vmxnet3", VMXNET3) \ _ ("AF_PACKET PMD", AF_PACKET) \ - _ ("net_bonding", BOND) \ _ ("net_fm10k", FM10K) \ _ ("net_cxgbe", CXGBE) \ _ ("net_mlx4", MLX4) \ @@ -108,7 +106,6 @@ typedef enum VNET_DPDK_PORT_TYPE_ETH_50G, VNET_DPDK_PORT_TYPE_ETH_56G, VNET_DPDK_PORT_TYPE_ETH_100G, - VNET_DPDK_PORT_TYPE_ETH_BOND, VNET_DPDK_PORT_TYPE_ETH_SWITCH, VNET_DPDK_PORT_TYPE_AF_PACKET, VNET_DPDK_PORT_TYPE_ETH_VF, @@ -163,8 +160,6 @@ typedef struct _( 4, MAYBE_MULTISEG, "maybe-multiseg") \ _( 5, HAVE_SUBIF, "subif") \ _( 6, HQOS, "hqos") \ - _( 7, BOND_SLAVE, "bond-slave") \ - _( 8, BOND_SLAVE_UP, "bond-slave-up") \ _( 9, TX_OFFLOAD, "tx-offload") \ _(10, INTEL_PHDR_CKSUM, "intel-phdr-cksum") \ _(11, RX_FLOW_OFFLOAD, "rx-flow-offload") \ @@ -243,13 +238,8 @@ typedef struct dpdk_device_hqos_per_worker_thread_t *hqos_wt; dpdk_device_hqos_per_hqos_thread_t *hqos_ht; - /* af_packet or BondEthernet instance number */ + /* af_packet instance number */ u16 af_packet_instance_num; - u16 bond_instance_num; - - /* Bonded interface port# of a slave - - only valid if DPDK_DEVICE_FLAG_BOND_SLAVE bit is set */ - dpdk_portid_t bond_port; struct rte_eth_link link; f64 time_last_link_update; -- cgit 1.2.3-korg