Merge pull request #5217 from mjstapp/fix_bgp_evpn_pi

bgpd: clarify evpn datastruct use for SA
FRRouting · Oct 24, 2019 · 9951e1c · 9951e1c
2 parents 5d98d94 + bd0254a
commit 9951e1c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
@@ -2608,9 +2608,10 @@ static int install_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
 		    && (struct bgp_path_info *)pi->extra->parent == parent_pi)
 			break;
 
-	if (!pi)
-		pi = bgp_create_evpn_bgp_path_info(parent_pi, rn);
-	else {
+	if (!pi) {
+		/* Create an info */
+		(void)bgp_create_evpn_bgp_path_info(parent_pi, rn);
+	} else {
 		if (attrhash_cmp(pi->attr, parent_pi->attr)
 		    && !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {
 			bgp_unlock_node(rn);