diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-05-14 09:53:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-14 09:53:42 -0400 |
| commit | 14faecad1441312dec85bfa83de7bfa66e55952c (patch) | |
| tree | fdfbbd9a17dfbc9c17ee1c34259529196cb1ef6e /zebra/zebra_evpn.c | |
| parent | 3743e0c3009a920a361bc9fb3b41df8153a11281 (diff) | |
| parent | 81157cbd10d3ebc6d3d31cb5617dadea1c98d454 (diff) | |
Merge pull request #11202 from anlancs/fix/check_zebra_vrf_get_evpn
zebra: remove unnecessary check for "zevpn_vrf"
Diffstat (limited to 'zebra/zebra_evpn.c')
| -rw-r--r-- | zebra/zebra_evpn.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c index 190341a85c..f2ad98c97b 100644 --- a/zebra/zebra_evpn.c +++ b/zebra/zebra_evpn.c @@ -73,7 +73,7 @@ int advertise_gw_macip_enabled(struct zebra_evpn *zevpn) struct zebra_vrf *zvrf; zvrf = zebra_vrf_get_evpn(); - if (zvrf && zvrf->advertise_gw_macip) + if (zvrf->advertise_gw_macip) return 1; if (zevpn && zevpn->advertise_gw_macip) @@ -87,7 +87,7 @@ int advertise_svi_macip_enabled(struct zebra_evpn *zevpn) struct zebra_vrf *zvrf; zvrf = zebra_vrf_get_evpn(); - if (zvrf && zvrf->advertise_svi_macip) + if (zvrf->advertise_svi_macip) return 1; if (zevpn && zevpn->advertise_svi_macip) @@ -999,7 +999,6 @@ struct zebra_evpn *zebra_evpn_lookup(vni_t vni) struct zebra_evpn *zevpn = NULL; zvrf = zebra_vrf_get_evpn(); - assert(zvrf); memset(&tmp_vni, 0, sizeof(tmp_vni)); tmp_vni.vni = vni; zevpn = hash_lookup(zvrf->evpn_table, &tmp_vni); @@ -1018,7 +1017,6 @@ struct zebra_evpn *zebra_evpn_add(vni_t vni) struct zebra_evpn *zevpn = NULL; zvrf = zebra_vrf_get_evpn(); - assert(zvrf); memset(&tmp_zevpn, 0, sizeof(tmp_zevpn)); tmp_zevpn.vni = vni; zevpn = hash_get(zvrf->evpn_table, &tmp_zevpn, zebra_evpn_alloc); @@ -1046,7 +1044,6 @@ int zebra_evpn_del(struct zebra_evpn *zevpn) struct zebra_evpn *tmp_zevpn; zvrf = zebra_vrf_get_evpn(); - assert(zvrf); zevpn->svi_if = NULL; @@ -1454,10 +1451,6 @@ void zebra_evpn_rem_macip_add(vni_t vni, const struct ethaddr *macaddr, } zvrf = zebra_vrf_get_evpn(); - if (!zvrf) - return; - - if (zebra_evpn_mac_remote_macip_add(zevpn, zvrf, macaddr, ipa_len, ipaddr, &mac, vtep_ip, flags, seq, esi) |