bgpd: Back out rest of e23b9ef6d2

Fully revert the rest of the e23b9ef6d2 commit as that it was breaking
route leaking between vrf's.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index baf2c1e0292d86f130c9a7274abf64475bc2a797..d4204126e170476fa90d9ad1f6a2c4f932815e70 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -578,7 +578,7 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
                return bpi;
        }
 
-       new = info_make(bpi_ultimate->type, BGP_ROUTE_IMPORTED, 0,
+       new = info_make(ZEBRA_ROUTE_BGP, BGP_ROUTE_IMPORTED, 0,
                bgp->peer_self, new_attr, bn);
 
        if (nexthop_self_flag)