]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: nhg->nexthop is not NULL
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 5 Mar 2020 14:28:58 +0000 (09:28 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 6 Mar 2020 21:37:19 +0000 (16:37 -0500)
We have already asserted on nhg->nexthop an if statement
to flog_err makes no sense.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
zebra/zebra_nhg.c

index ee90b83ebe647558390e4083e9c6c9c85cfe7645..fcd90c23e89d7d994bbe1324959a76c8f6240546 100644 (file)
@@ -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;