pbrd: fix duplicate nexthop entries under nexthop-group

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
donaldsharp · Feb 21, 2018 · fbe26fe · fbe26fe
1 parent 308ed8e
commit fbe26fe
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
@@ -261,17 +261,15 @@ DEFPY(ecmp_nexthops,
 			nhop.type = NEXTHOP_TYPE_IPV6;
 	}
 
-	if (no) {
-		nh = nexthop_exists(&nhgc->nhg, &nhop);
-		if (nh) {
-			nexthop_del(&nhgc->nhg, nh);
-			nexthop_free(nh);
-
-			if (nhg_hooks.del_nexthop)
-				nhg_hooks.del_nexthop(nhgc->name);
-		}
-	}
-	else {
+	nh = nexthop_exists(&nhgc->nhg, &nhop);
+
+	if (no && nh) {
+		nexthop_del(&nhgc->nhg, nh);
+		nexthop_free(nh);
+
+		if (nhg_hooks.del_nexthop)
+			nhg_hooks.del_nexthop(nhgc->name);
+	} else if (!nh) {
 		/* must be adding new nexthop since !no and !nexthop_exists */
 		nh = nexthop_new();