proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 14:34:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: remove unnecessary checkings for bgp_evpn_es_new()

Browse Source 
Currently, `bgp_evpn_es_new()` always has an invald `struct bgp` pointer as
its input parameter, and it will always return valid `es`.

So two cleanup changes:
- Remove unnecessary checking for `bgp` in `bgp_evpn_es_new()`
- Remove unnecessary checkings of `bgp_evpn_es_new()`'s callers.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
This commit is contained in:
anlan_cs 2022-03-22 06:22:20 -04:00
parent fd5dbc8e48
commit 573eeb2bfb
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bgpd/bgp_evpn_mh.c
View File

@ -1902,9 +1902,6 @@ static struct bgp_evpn_es *bgp_evpn_es_new(struct bgp *bgp, const esi_t *esi)
{ {
struct bgp_evpn_es *es; struct bgp_evpn_es *es;
if (!bgp)
return NULL;
es = XCALLOC(MTYPE_BGP_EVPN_ES, sizeof(struct bgp_evpn_es)); es = XCALLOC(MTYPE_BGP_EVPN_ES, sizeof(struct bgp_evpn_es));
/* set the ESI */ /* set the ESI */
@ -2364,7 +2361,6 @@ int bgp_evpn_local_es_add(struct bgp *bgp, esi_t *esi,
struct in_addr originator_ip, bool oper_up, struct in_addr originator_ip, bool oper_up,
uint16_t df_pref, bool bypass) uint16_t df_pref, bool bypass)
{ {
char buf[ESI_STR_LEN];
struct bgp_evpn_es *es; struct bgp_evpn_es *es;
bool new_es = true; bool new_es = true;
bool regen_esr = false; bool regen_esr = false;
@ -2374,15 +2370,8 @@ int bgp_evpn_local_es_add(struct bgp *bgp, esi_t *esi,
if (es) { if (es) {
if (CHECK_FLAG(es->flags, BGP_EVPNES_LOCAL)) if (CHECK_FLAG(es->flags, BGP_EVPNES_LOCAL))
new_es = false; new_es = false;
} else { } else
es = bgp_evpn_es_new(bgp, esi); es = bgp_evpn_es_new(bgp, esi);
if (!es) {
flog_err(EC_BGP_ES_CREATE,
"%u: Failed to allocate ES entry for ESI %s - at Local ES Add",
bgp->vrf_id, esi_to_str(esi, buf, sizeof(buf)));
return -1;
}
}
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("add local es %s orig-ip %pI4 df_pref %u %s", zlog_debug("add local es %s orig-ip %pI4 df_pref %u %s",
@ -3826,15 +3815,8 @@ int bgp_evpn_remote_es_evi_add(struct bgp *bgp, struct bgpevpn *vpn,
&p->prefix.ead_addr.ip.ipaddr_v4); &p->prefix.ead_addr.ip.ipaddr_v4);
es = bgp_evpn_es_find(esi); es = bgp_evpn_es_find(esi);
if (!es) { if (!es)
es = bgp_evpn_es_new(bgp, esi); es = bgp_evpn_es_new(bgp, esi);
if (!es) {
flog_err(EC_BGP_ES_CREATE,
"%u: Failed to allocate ES entry for ESI %s - at remote ES Add",
bgp->vrf_id, esi_to_str(esi, buf, sizeof(buf)));
return -1;
}
}
es_evi = bgp_evpn_es_evi_find(es, vpn); es_evi = bgp_evpn_es_evi_find(es, vpn);
if (!es_evi) { if (!es_evi) {