From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 10 Mar 2017 00:37:23 +0000 (-0500)
Subject: zebra: Fix specific prefix handling
X-Git-Tag: frr-2.0~9^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=feb554e5089492871aefb9016b875e5352ecc5a8;p=matthieu%2Ffrr.git

zebra: Fix specific prefix handling

Suppose we are handling the process_workq and either a new static
route is installed or a Routing Protocol installs a new route.
We will call evaluate_rnh with a specific prefix.  We might
have a situation where we clear the NHC flag prematurely.

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

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index edfe274922..b679803b06 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -730,10 +730,7 @@ zebra_evaluate_rnh (vrf_id_t vrfid, int family, int force, rnh_type_t type,
       /* Evaluating a specific entry, make sure it exists. */
       nrn = route_node_lookup (rnh_table, p);
       if (nrn && nrn->info)
-        {
-          zebra_rnh_evaluate_entry (vrfid, family, force, type, nrn);
-          zebra_rnh_clear_nhc_flag (vrfid, family, type, nrn);
-        }
+        zebra_rnh_evaluate_entry (vrfid, family, force, type, nrn);
 
       if (nrn)
         route_unlock_node (nrn);