diff options
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 6 | ||||
| -rw-r--r-- | bgpd/bgp_vty.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index a1d0a8512c..b03171b4c8 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -3734,6 +3734,9 @@ void vpn_leak_postchange_all(void) if (bgp->inst_type != BGP_INSTANCE_TYPE_VRF) continue; + if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO)) + continue; + vpn_leak_postchange( BGP_VPN_POLICY_DIR_TOVPN, AFI_IP, @@ -3753,6 +3756,9 @@ void vpn_leak_postchange_all(void) if (bgp->inst_type != BGP_INSTANCE_TYPE_VRF) continue; + if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO)) + continue; + vpn_leak_postchange( BGP_VPN_POLICY_DIR_FROMVPN, AFI_IP, diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index ae14abe9e3..828fa711b2 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -1703,7 +1703,7 @@ DEFUN (no_router_bgp, continue; if (CHECK_FLAG(tmp_bgp->vrf_flags, BGP_VRF_AUTO)) - continue; + bgp_delete(tmp_bgp); if (CHECK_FLAG( tmp_bgp->af_flags[AFI_IP] |