1 files changed, 14 insertions, 14 deletions

diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 1a70250627..4f41406a5c 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -49,7 +49,8 @@ DEFINE_MTYPE_STATIC(ZEBRA, NHG_CTX, "Nexthop Group Context");
 /* id counter to keep in sync with kernel */
 uint32_t id_counter;
 
-static struct nhg_hash_entry *depends_find(struct nexthop *nh, afi_t afi);
+static struct nhg_hash_entry *depends_find(const struct nexthop *nh,
+					   afi_t afi);
 static void depends_add(struct nhg_connected_tree_head *head,
 			struct nhg_hash_entry *depend);
 static struct nhg_hash_entry *
@@ -593,7 +594,7 @@ zebra_nhg_find_nexthop(uint32_t id, struct nexthop *nh, afi_t afi, int type)
 
 	nexthop_group_add_sorted(&nhg, nh);
 
-	zebra_nhg_find(&nhe, id, &nhg, NULL, nh->vrf_id, afi, 0);
+	zebra_nhg_find(&nhe, id, &nhg, NULL, nh->vrf_id, afi, type);
 
 	return nhe;
 }
@@ -1047,25 +1048,24 @@ int zebra_nhg_kernel_del(uint32_t id)
 }
 
 /* Some dependency helper functions */
-static struct nhg_hash_entry *depends_find(struct nexthop *nh, afi_t afi)
+static struct nhg_hash_entry *depends_find(const struct nexthop *nh, afi_t afi)
 {
-	struct nexthop *lookup = NULL;
+	struct nexthop lookup;
 	struct nhg_hash_entry *nhe = NULL;
 
 	if (!nh)
 		goto done;
 
-	copy_nexthops(&lookup, nh, NULL);
-
-	/* Clear it, in case its a group */
-	nexthops_free(lookup->next);
-	nexthops_free(lookup->prev);
-	lookup->next = NULL;
-	lookup->prev = NULL;
+	/* Capture a snapshot of this single nh; it might be part of a list,
+	 * so we need to make a standalone copy.
+	 */
+	memset(&lookup, 0, sizeof(lookup));
+	nexthop_copy(&lookup, nh, NULL);
 
-	nhe = zebra_nhg_find_nexthop(0, lookup, afi, 0);
+	nhe = zebra_nhg_find_nexthop(0, &lookup, afi, 0);
 
-	nexthops_free(lookup);
+	/* The copy may have allocated labels; free them if necessary. */
+	nexthop_del_labels(&lookup);
 
 done:
 	return nhe;
@@ -1790,7 +1790,7 @@ uint8_t zebra_nhg_nhe2grp(struct nh_grp *grp, struct nhg_hash_entry *nhe,
 		if (!duplicate) {
 			grp[i].id = depend->id;
 			/* We aren't using weights for anything right now */
-			grp[i].weight = 0;
+			grp[i].weight = depend->nhg->nexthop->weight;
 			i++;
 		}