From 986512a3200bfc83f80b9f559917ece4f123e4a4 Mon Sep 17 00:00:00 2001 From: Tuetuopay Date: Wed, 27 Mar 2019 02:13:16 +0100 Subject: [PATCH] zebra: Change checks for EVPN VRF to a macro A lot of checks relied on the VRF ID and the EVPN VRF ID to be the same. This patch changes those checks to the EVPN_ENABLED macro, which checks if the VRF is the EVPN one. Signed-off-by: Tuetuopay Sponsored-by: Scaleway --- zebra/zebra_vxlan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 2934a2ecd5..c7a5e1ad86 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -7762,7 +7762,7 @@ void zebra_vxlan_remote_vtep_del(ZAPI_HANDLER_ARGS) return; } - if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) { + if (!EVPN_ENABLED(zvrf)) { zlog_debug("Recv MACIP DEL for non-EVPN VRF %u", zvrf_id(zvrf)); return; @@ -7846,7 +7846,7 @@ void zebra_vxlan_remote_vtep_add(ZAPI_HANDLER_ARGS) return; } - if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) { + if (!EVPN_ENABLED(zvrf)) { zlog_debug("Recv MACIP ADD for non-EVPN VRF %u", zvrf_id(zvrf)); return; @@ -8734,7 +8734,7 @@ void zebra_vxlan_flood_control(ZAPI_HANDLER_ARGS) struct stream *s; enum vxlan_flood_control flood_ctrl; - if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) { + if (!EVPN_ENABLED(zvrf)) { zlog_err("EVPN flood control for non-EVPN VRF %u", zvrf_id(zvrf)); return; @@ -8774,7 +8774,7 @@ void zebra_vxlan_advertise_svi_macip(ZAPI_HANDLER_ARGS) zebra_vni_t *zvni = NULL; struct interface *ifp = NULL; - if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) { + if (!EVPN_ENABLED(zvrf)) { zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", zvrf_id(zvrf)); return; @@ -8873,7 +8873,7 @@ void zebra_vxlan_advertise_subnet(ZAPI_HANDLER_ARGS) struct zebra_l2info_vxlan zl2_info; struct interface *vlan_if = NULL; - if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) { + if (!EVPN_ENABLED(zvrf)) { zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", zvrf_id(zvrf)); return; @@ -8936,7 +8936,7 @@ void zebra_vxlan_advertise_gw_macip(ZAPI_HANDLER_ARGS) zebra_vni_t *zvni = NULL; struct interface *ifp = NULL; - if (zvrf_id(zvrf) != zebra_vrf_get_evpn_id()) { + if (!EVPN_ENABLED(zvrf)) { zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", zvrf_id(zvrf)); return; -- 2.39.5