diff options
Diffstat (limited to 'bgpd/bgp_main.c')
| -rw-r--r-- | bgpd/bgp_main.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 6a01a6137c..d9b0fab518 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -294,19 +294,6 @@ static int bgp_vrf_enable(struct vrf *vrf) bgp = bgp_lookup_by_name(vrf->name); if (bgp && bgp->vrf_id != vrf->vrf_id) { - if (bgp->name && strmatch(vrf->name, VRF_DEFAULT_NAME)) { - XFREE(MTYPE_BGP, bgp->name); - XFREE(MTYPE_BGP, bgp->name_pretty); - bgp->name_pretty = XSTRDUP(MTYPE_BGP, "VRF default"); - bgp->inst_type = BGP_INSTANCE_TYPE_DEFAULT; -#ifdef ENABLE_BGP_VNC - if (!bgp->rfapi) { - bgp->rfapi = bgp_rfapi_new(bgp); - assert(bgp->rfapi); - assert(bgp->rfapi_cfg); - } -#endif /* ENABLE_BGP_VNC */ - } old_vrf_id = bgp->vrf_id; /* We have instance configured, link to VRF and make it "up". */ bgp_vrf_link(bgp, vrf); @@ -367,8 +354,7 @@ static int bgp_vrf_disable(struct vrf *vrf) static void bgp_vrf_init(void) { - vrf_init(bgp_vrf_new, bgp_vrf_enable, bgp_vrf_disable, - bgp_vrf_delete, bgp_vrf_enable); + vrf_init(bgp_vrf_new, bgp_vrf_enable, bgp_vrf_disable, bgp_vrf_delete); } static void bgp_vrf_terminate(void) |