Merge pull request #762 from bingen/mutiple_nh_recursive_levels

[mirror_frr.git] / zebra / zebra_rnh.c

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 5dc504b41b649b6a99effbc8c934c1c3e8ab6fb3..12bb19935be290237ed3fe85adba49996c139fea 100644 (file)
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -420,12 +420,11 @@ zebra_rnh_eval_import_check_entry (vrf_id_t vrfid, int family, int force,
   struct zserv *client;
   char bufn[INET6_ADDRSTRLEN];
   struct listnode *node;
-  struct nexthop *nexthop, *tnexthop;
-  int recursing;
+  struct nexthop *nexthop;
 
   if (re && (rnh->state == NULL))
     {
-      for (ALL_NEXTHOPS_RO(re->nexthop, nexthop, tnexthop, recursing))
+      for (ALL_NEXTHOPS(re->nexthop, nexthop))
         if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB))
           {
             state_changed = 1;
@@ -831,7 +830,6 @@ static void
 copy_state (struct rnh *rnh, struct route_entry *re, struct route_node *rn)
 {
   struct route_entry *state;
-  struct nexthop *nh;
 
   if (rnh->state)
     {
@@ -846,8 +844,7 @@ copy_state (struct rnh *rnh, struct route_entry *re, struct route_node *rn)
   state->type = re->type;
   state->metric = re->metric;
 
-  for (nh = re->nexthop; nh; nh = nh->next)
-    route_entry_copy_nexthops(state, nh);
+  route_entry_copy_nexthops(state, re->nexthop);
   rnh->state = state;
 }