From f23890138e02d4218c828c427f687f8ecdb0e165 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 28 Oct 2018 13:36:45 -0700 Subject: [PATCH] bond: problem switching from l2 to l3 when the last interface is removed from l2 in the bonding group, we should invoke ethernet_set_rx_direct to allow ip packets to go directly to ip4-input. Change-Id: I43b3cd64e2c119762edd0c295bb9348732adab45 Signed-off-by: Steven --- src/vnet/bonding/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c index e2459db3d29..13ff644fd73 100644 --- a/src/vnet/bonding/device.c +++ b/src/vnet/bonding/device.c @@ -104,6 +104,17 @@ bond_set_l2_mode_function (vnet_main_t * vnm, ethernet_set_rx_redirect (vnm, sif_hw, 1); } } + else if ((bif_hw->l2_if_count == 0) && (l2_if_adjust == -1)) + { + /* Just removed last L2 subinterface on this port */ + vec_foreach (sw_if_index, bif->slaves) + { + sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index); + + /* Allow ip packets to go directly to ip4-input etc */ + ethernet_set_rx_redirect (vnm, sif_hw, 0); + } + } return 0; } -- 2.16.6