From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 5 Mar 2020 14:28:58 +0000 (-0500)
Subject: zebra: nhg->nexthop is not NULL
X-Git-Tag: base_7.4~279^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0752c8d8a4e2f64895404b1e23e230c38902dd64;p=mirror%2Ffrr.git

zebra: nhg->nexthop is not NULL

We have already asserted on nhg->nexthop an if statement
to flog_err makes no sense.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index ee90b83ebe..fcd90c23e8 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -1193,12 +1193,6 @@ zebra_nhg_rib_find(uint32_t id, struct nexthop_group *nhg, afi_t rt_afi)
 	assert(nhg->nexthop);
 	vrf_id = !vrf_is_backend_netns() ? VRF_DEFAULT : nhg->nexthop->vrf_id;
 
-	if (!(nhg && nhg->nexthop)) {
-		flog_err(EC_ZEBRA_TABLE_LOOKUP_FAILED,
-			 "No nexthop passed to %s", __func__);
-		return NULL;
-	}
-
 	zebra_nhg_find(&nhe, id, nhg, NULL, vrf_id, rt_afi, 0);
 
 	return nhe;