From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 7 Dec 2018 20:55:06 +0000 (-0500)
Subject: bgpd: Back out rest of e23b9ef6d2
X-Git-Tag: frr-7.1-dev~117^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F3455%2Fhead;p=mirror%2Ffrr.git

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 baf2c1e029..d4204126e1 100644
--- 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)