diff options
| author |   Matthew Smith <mgsmith@netgate.com> | 2020-05-29 12:29:45 -0500 |
|---|---|---|
| committer | Matthew Smith <mgsmith@netgate.com> | 2020-05-29 21:59:32 +0000 |
| commit | 7285103a744dda9e4910677cc44a5eeb091a7a5a (patch) | |
| tree | e1525f1315b88ce91c2402baf85efec495bfd5ad /src/vnet | |
| parent | f3c1e4b61269cd93302073a631a2549f1aeb24d9 (diff) | |
bonding: Revert adjust link state
This reverts commit 9121c415a91904be50071ec55143d9c89b2f1b91.
Reason for revert: causes deadlock with multiple worker threads
Type: fix
Change-Id: Icf3d6d343d99d887abacbaa03acbf04d4628514e
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/bonding/cli.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c index c40d4f391f6..92a9ff067f6 100644 --- a/src/vnet/bonding/cli.c +++ b/src/vnet/bonding/cli.c @@ -26,7 +26,6 @@ void bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) { bond_main_t *bm = &bond_main; - vnet_main_t *vnm = vnet_get_main (); bond_if_t *bif; int i; uword p; @@ -55,15 +54,6 @@ bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) ASSERT (bif->n_numa_slaves >= 0); } } - /* If that was the last active slave, set bond link state down */ - if (!vec_len (bif->active_slaves)) - { - vnet_hw_interface_flags_t flags; - - flags = vnet_hw_interface_get_flags (vnm, bif->hw_if_index); - flags &= ~VNET_HW_INTERFACE_FLAG_LINK_UP; - vnet_hw_interface_set_flags (vnm, bif->hw_if_index, flags); - } break; } } @@ -168,16 +158,6 @@ bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) else vec_add1 (bif->active_slaves, sif->sw_if_index); - /* If this was the first active slave, set bond link state up */ - if (vec_len (bif->active_slaves) == 1) - { - vnet_hw_interface_flags_t flags; - - flags = vnet_hw_interface_get_flags (vnm, bif->hw_if_index); - flags |= VNET_HW_INTERFACE_FLAG_LINK_UP; - vnet_hw_interface_set_flags (vnm, bif->hw_if_index, flags); - } - sif->is_local_numa = (vm->numa_node == hw->numa_node) ? 1 : 0; if (bif->mode == BOND_MODE_ACTIVE_BACKUP) { @@ -489,6 +469,9 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args) if (vlib_get_thread_main ()->n_vlib_mains > 1) clib_spinlock_init (&bif->lockp); + vnet_hw_interface_set_flags (vnm, bif->hw_if_index, + VNET_HW_INTERFACE_FLAG_LINK_UP); + hash_set (bm->bond_by_sw_if_index, bif->sw_if_index, bif->dev_instance); // for return |