From: G. Paul Ziemba <paulz@labn.net>
Date: Thu, 22 Mar 2018 04:18:25 +0000 (-0700)
Subject: bgpd: qualify use of BGP_ROUTE_RFP with ENABLE_BGP_VNC
X-Git-Tag: frr-5.0-dev~127^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=56c2c080f4be618ae7d78b19a21e97a80f2aa78f;p=mirror%2Ffrr.git

bgpd: qualify use of BGP_ROUTE_RFP with ENABLE_BGP_VNC

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
---

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 00878e1f46..9f740db325 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -968,12 +968,14 @@ void vpn_leak_to_vrf_withdraw(struct bgp *bgp_vpn,       /* from */
 		zlog_debug("%s: start (info_vpn=%p)", __func__, info_vpn);
 
 	if (!info_vpn->net) {
+#if ENABLE_BGP_VNC
 		/* BGP_ROUTE_RFP routes do not have info_vpn->net set (yet) */
 		if (info_vpn->type == ZEBRA_ROUTE_BGP &&
 			info_vpn->sub_type == BGP_ROUTE_RFP) {
 
 			return;
 		}
+#endif
 		if (debug)
 			zlog_debug("%s: info_vpn->net unexpectedly NULL, no prefix, bailing",
 				__func__);