bonding: process lacp when bond is admin down

mgsmith1000 · ayourtch · commit 03c0ef95cb53 · 2020-01-28T13:44:25.000Z
Ticket: VPP-1821 Type: fix Fixes: 6dfd378 When a bond interface is administratively down but the slaves are up, process inbound LACP packets received over the slaves. This was the old behavior with bond interfaces in LACP mode and was altered unintentionally by another change. Restore the old behavior. Change-Id: I61b0b700211dea4859b6ee447ab83b33197d9d11 Signed-off-by: Matthew Smith <mgsmith@netgate.com> (cherry picked from commit 854eb6e)
diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c
@@ -163,7 +163,6 @@ bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node,
     {
       *bond_sw_if_index = slave_sw_if_index;
       *error = node->errors[BOND_INPUT_ERROR_IF_DOWN];
-      return;
     }
 
   if (PREDICT_FALSE ((bif->mode == BOND_MODE_ACTIVE_BACKUP) &&

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,6 @@ bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node,`
`163`	`163`	`{`
`164`	`164`	`*bond_sw_if_index = slave_sw_if_index;`
`165`	`165`	`*error = node->errors[BOND_INPUT_ERROR_IF_DOWN];`
`166`		`- return;`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`if (PREDICT_FALSE ((bif->mode == BOND_MODE_ACTIVE_BACKUP) &&`