Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10836 from anlancs/bgpd-mh-delay-esi 

zebra: delay setting esi in zebra_evpn_local_es_update()
This commit is contained in:
Donatas Abraitis 2022-05-23 07:49:08 +02:00 committed by GitHub
parent a830fc4c79 0dfc0dd974
commit 4febdb6b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_evpn_mh.c
View File

@ -2312,7 +2312,6 @@ static int zebra_evpn_local_es_update(struct zebra_if *zif, esi_t *esi)
struct zebra_evpn_es *old_es = zif->es_info.es;
struct zebra_evpn_es *es;
memcpy(&zif->es_info.esi, esi, sizeof(*esi));
if (old_es && !memcmp(&old_es->esi, esi, sizeof(*esi)))
/* dup - nothing to be done */
return 0;
@ -2324,15 +2323,14 @@ static int zebra_evpn_local_es_update(struct zebra_if *zif, esi_t *esi)
es = zebra_evpn_es_find(esi);
if (es) {
/* if it exists against another interface flag an error */
if (es->zif && es->zif != zif) {
memset(&zif->es_info.esi, 0, sizeof(*esi));
if (es->zif && es->zif != zif)
return -1;
}
} else {
/* create new es */
es = zebra_evpn_es_new(esi);
}
memcpy(&zif->es_info.esi, esi, sizeof(*esi));
if (es)
zebra_evpn_es_local_info_set(es, zif);