Merge branch 'master' into evpn-session-vrf

[mirror_frr.git] / bgpd / bgp_zebra.c

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index d9749863ecedf22cf182b3f7594c14fc3c6542c9..66fcbb3f3afa9ed82a79b676985b45bcbb6d116e 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1632,8 +1632,7 @@ int bgp_redistribute_set(struct bgp *bgp, afi_t afi, int type,
                        return CMD_WARNING;
 
 #if ENABLE_BGP_VNC
-               if (bgp->vrf_id == VRF_DEFAULT
-                   && type == ZEBRA_ROUTE_VNC_DIRECT) {
+               if (EVPN_ENABLED(bgp) && type == ZEBRA_ROUTE_VNC_DIRECT) {
                        vnc_export_bgp_enable(
                                bgp, afi); /* only enables if mode bits cfg'd */
                }
@@ -1794,7 +1793,7 @@ int bgp_redistribute_unset(struct bgp *bgp, afi_t afi, int type,
  * status. red lookup fails if there is no zebra connection.
  */
 #if ENABLE_BGP_VNC
-       if (bgp->vrf_id == VRF_DEFAULT && type == ZEBRA_ROUTE_VNC_DIRECT) {
+       if (EVPN_ENABLED(bgp) && type == ZEBRA_ROUTE_VNC_DIRECT) {
                vnc_export_bgp_disable(bgp, afi);
        }
 #endif
@@ -1880,9 +1879,8 @@ void bgp_zebra_instance_register(struct bgp *bgp)
        /* Register for router-id, interfaces, redistributed routes. */
        zclient_send_reg_requests(zclient, bgp->vrf_id);
 
-       /* For default instance, register to learn about VNIs, if appropriate.
-        */
-       if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT && is_evpn_enabled())
+       /* For EVPN instance, register to learn about VNIs, if appropriate. */
+       if (bgp->advertise_all_vni)
                bgp_zebra_advertise_all_vni(bgp, 1);
 
        bgp_nht_register_nexthops(bgp);
@@ -1900,9 +1898,8 @@ void bgp_zebra_instance_deregister(struct bgp *bgp)
        if (BGP_DEBUG(zebra, ZEBRA))
                zlog_debug("Deregistering VRF %u", bgp->vrf_id);
 
-       /* For default instance, unregister learning about VNIs, if appropriate.
-        */
-       if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT && is_evpn_enabled())
+       /* For EVPN instance, unregister learning about VNIs, if appropriate. */
+       if (bgp->advertise_all_vni)
                bgp_zebra_advertise_all_vni(bgp, 0);
 
        /* Deregister for router-id, interfaces, redistributed routes. */