diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/bonding/cli.c | 6 | ||||
| -rw-r--r-- | src/vnet/bonding/device.c | 26 | ||||
| -rw-r--r-- | src/vnet/bonding/node.c | 33 |
3 files changed, 39 insertions, 26 deletions
diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c index 9d3b9429ba7..f45a31ce99a 100644 --- a/src/vnet/bonding/cli.c +++ b/src/vnet/bonding/cli.c @@ -576,7 +576,8 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) pool_get (bm->neighbors, sif); clib_memset (sif, 0, sizeof (*sif)); sw = pool_elt_at_index (im->sw_interfaces, args->slave); - sif->port_enabled = sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP; + /* port_enabled is both admin up and hw link up */ + sif->port_enabled = vnet_sw_interface_is_up (vnm, sw->sw_if_index); sif->sw_if_index = sw->sw_if_index; sif->hw_if_index = sw->hw_if_index; sif->packet_template_index = (u8) ~ 0; @@ -642,8 +643,7 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) if (bm->lacp_enable_disable) (*bm->lacp_enable_disable) (vm, bif, sif, 1); } - else if (sif->port_enabled && - (sif_hw->flags & VNET_HW_INTERFACE_FLAG_LINK_UP)) + else if (sif->port_enabled) { bond_enable_collecting_distributing (vm, sif); } diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c index e9771959437..77a53b6a17a 100644 --- a/src/vnet/bonding/device.c +++ b/src/vnet/bonding/device.c @@ -777,9 +777,10 @@ bond_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) for (i = 0; i < vec_len (event_data); i++) { hw_if_index = event_data[i]; - /* walk hw interface to process all subinterfaces */ - vnet_hw_interface_walk_sw (vnm, hw_if_index, - bond_active_interface_switch_cb, 0); + if (vnet_get_hw_interface_or_null (vnm, hw_if_index)) + /* walk hw interface to process all subinterfaces */ + vnet_hw_interface_walk_sw (vnm, hw_if_index, + bond_active_interface_switch_cb, 0); } vec_reset_length (event_data); } @@ -808,6 +809,25 @@ VNET_DEVICE_CLASS (bond_dev_class) = { /* *INDENT-ON* */ +static clib_error_t * +bond_slave_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) +{ + bond_main_t *bm = &bond_main; + slave_if_t *sif; + bond_detach_slave_args_t args = { 0 }; + + if (is_add) + return 0; + sif = bond_get_slave_by_sw_if_index (sw_if_index); + if (!sif) + return 0; + args.slave = sw_if_index; + bond_detach_slave (bm->vlib_main, &args); + return args.error; +} + +VNET_SW_INTERFACE_ADD_DEL_FUNCTION (bond_slave_interface_add_del); + /* * fd.io coding-style-patch-verification: ON * diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c index 6fc74710fda..ce5aefab2fd 100644 --- a/src/vnet/bonding/node.c +++ b/src/vnet/bonding/node.c @@ -394,23 +394,16 @@ bond_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags) sif = bond_get_slave_by_sw_if_index (sw_if_index); if (sif) { - sif->port_enabled = flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP; if (sif->lacp_enabled) return 0; + /* port_enabled is both admin up and hw link up */ + sif->port_enabled = ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) && + vnet_sw_interface_is_link_up (vnm, sw_if_index)); if (sif->port_enabled == 0) - { - bond_disable_collecting_distributing (vm, sif); - } + bond_disable_collecting_distributing (vm, sif); else - { - vnet_main_t *vnm = vnet_get_main (); - vnet_hw_interface_t *hw = - vnet_get_sup_hw_interface (vnm, sw_if_index); - - if (hw->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) - bond_enable_collecting_distributing (vm, sif); - } + bond_enable_collecting_distributing (vm, sif); } return 0; @@ -433,14 +426,14 @@ bond_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) if (sif->lacp_enabled) return 0; - if (!(flags & VNET_HW_INTERFACE_FLAG_LINK_UP)) - { - bond_disable_collecting_distributing (vm, sif); - } - else if (sif->port_enabled) - { - bond_enable_collecting_distributing (vm, sif); - } + /* port_enabled is both admin up and hw link up */ + sif->port_enabled = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) && + vnet_sw_interface_is_admin_up (vnm, + sw->sw_if_index)); + if (sif->port_enabled == 0) + bond_disable_collecting_distributing (vm, sif); + else + bond_enable_collecting_distributing (vm, sif); } return 0; |