]> git.puffer.fish Git - mirror/frr.git/commitdiff
Revert "isisd: allow nexthop lookup on interface only"
authorDonatas Abraitis <donatas@opensourcerouting.org>
Sun, 10 Jul 2022 18:41:17 +0000 (21:41 +0300)
committerDonatas Abraitis <donatas@opensourcerouting.org>
Sun, 10 Jul 2022 18:41:17 +0000 (21:41 +0300)
This reverts commit a11742dc53e31d1379cb4f7b9b7b750614e30928.

isisd/isis_route.c

index 0e7947dd46e2f27a7e16d01e86831b308cde4f46..a91ce7eeac2c135828f7047a59df2ddf8c9787ef 100644 (file)
@@ -91,16 +91,10 @@ static struct isis_nexthop *nexthoplookup(struct list *nexthops, int family,
        struct isis_nexthop *nh;
 
        for (ALL_LIST_ELEMENTS_RO(nexthops, node, nh)) {
-               if (nh->ifindex != ifindex)
-                       continue;
-
-               /* if the IP is unspecified, return the first nexthop found on
-                * the interface */
-               if (!ip)
-                       return nh;
-
                if (nh->family != family)
                        continue;
+               if (nh->ifindex != ifindex)
+                       continue;
 
                switch (family) {
                case AF_INET: