backport gerrit 40379 from upstream

This commit is contained in:
Pim van Pelt
2024-06-27 17:43:54 +02:00
parent 25b2999485
commit 61386a1c63

View File

@ -263,7 +263,10 @@ lcp_itf_pair_add (u32 host_sw_if_index, u32 phy_sw_if_index, u8 *host_name,
vec_validate_init_empty (lip_db_by_host, host_sw_if_index, INDEX_INVALID); vec_validate_init_empty (lip_db_by_host, host_sw_if_index, INDEX_INVALID);
lip_db_by_phy[phy_sw_if_index] = lipi; lip_db_by_phy[phy_sw_if_index] = lipi;
lip_db_by_host[host_sw_if_index] = lipi; lip_db_by_host[host_sw_if_index] = lipi;
hash_set (lip_db_by_vif, host_index, lipi); if (clib_strcmp ((char *) ns, (char *) lcp_get_default_ns ()) == 0)
{
hash_set (lip_db_by_vif, host_index, lipi);
}
lip->lip_host_sw_if_index = host_sw_if_index; lip->lip_host_sw_if_index = host_sw_if_index;
lip->lip_phy_sw_if_index = phy_sw_if_index; lip->lip_phy_sw_if_index = phy_sw_if_index;
@ -1095,7 +1098,7 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
vnet_sw_interface_admin_up (vnm, host_sw_if_index); vnet_sw_interface_admin_up (vnm, host_sw_if_index);
if (lcp_sync ()) if (lcp_sync ())
{ {
lip = lcp_itf_pair_get (lcp_itf_pair_find_by_vif (vif_index)); lip = lcp_itf_pair_get (lcp_itf_pair_find_by_phy (phy_sw_if_index));
lcp_itf_pair_sync_state (lip); lcp_itf_pair_sync_state (lip);
} }
/* /*