Merge pull request #12303 from donaldsharp/relax_if_type_check

zebra: relax if_type check to allow early ES config creation
FRRouting · Nov 11, 2022 · 744de7c · 744de7c
2 parents 2bb16f6 + 3fa177e
commit 744de7c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
@@ -2759,6 +2759,12 @@ bool zebra_evpn_is_if_es_capable(struct zebra_if *zif)
 	if (zif->zif_type == ZEBRA_IF_BOND)
 		return true;
 
+	/* relax the checks to allow config to be applied in zebra
+	 * before interface is rxed from the kernel
+	 */
+	if (zif->ifp->ifindex == IFINDEX_INTERNAL)
+		return true;
+
 	/* XXX: allow swpX i.e. a regular ethernet port to be an ES link too */
 	return false;
 }