Merge pull request FRRouting#16743 from lsang6WIND/vpn_leak_label

ton31337 · web-flow · commit 4f185c5c9d0e · 2024-09-04T13:34:12.000+03:00
bgpd: remove redundant loopback check in label update
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
@@ -304,7 +304,7 @@ void vpn_leak_zebra_vrf_label_update(struct bgp *bgp, afi_t afi)
 
 	if (vpn_leak_to_vpn_active(bgp, afi, NULL, false)) {
 		ifp = if_get_vrf_loopback(bgp->vrf_id);
-		if (ifp && if_is_vrf(ifp) && if_is_up(ifp))
+		if (ifp && if_is_up(ifp))
 			label = bgp->vpn_policy[afi].tovpn_label;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ void vpn_leak_zebra_vrf_label_update(struct bgp *bgp, afi_t afi)`
`304`	`304`
`305`	`305`	`if (vpn_leak_to_vpn_active(bgp, afi, NULL, false)) {`
`306`	`306`	`ifp = if_get_vrf_loopback(bgp->vrf_id);`
`307`		`- if (ifp && if_is_vrf(ifp) && if_is_up(ifp))`
	`307`	`+ if (ifp && if_is_up(ifp))`
`308`	`308`	`label = bgp->vpn_policy[afi].tovpn_label;`
`309`	`309`	`}`
`310`	`310`