ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "bond: problem switching from l2 to l3"" [VPP-1651]

Browse Source 
This reverts commit 5d0d5494db.

The csit crash was actually due to the test image missing the patch
https://gerrit.fd.io/r/#/c/17731/

It was a mistake to revert the original patch
https://gerrit.fd.io/r/#/c/15577/

Change-Id: I7fc563981aa13d308d55b25194fee21475ebc57d
Signed-off-by: Steven Luong <sluong@cisco.com>
(cherry picked from commit a1f9ee8ea6)
This commit is contained in:
Steven Luong
2019-04-09 12:18:46 -07:00
committed by Dave Wallace
parent 6545df3b2c
commit 0d7332e43f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vnet/bonding/device.c
View File

@ -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;
}