[zebra] rib loop check for RIB_ENTRY_REMOVED checks wrong var

2007-06-25 Denis Ovsienko

	* zebra_rib.c: (rib_add_ipv4_multipath) Loop through RIB
	  is using 'same' variable, but RIB_ENTRY_REMOVED check
	  is testing the constant 'rib' variable, fix. Impact
	  unknown at this point.

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 6a86122c25c67d9f894cf132c064173c2a6bef4f..ab6688c67943422f8c15d2401ac25db30de852c7 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-25 Denis Ovsienko
+
+       * zebra_rib.c: (rib_add_ipv4_multipath) Loop through RIB
+         is using 'same' variable, but RIB_ENTRY_REMOVED check
+         is testing the constant 'rib' variable, fix. Impact
+         unknown at this point.
+
 2007-05-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * zebra_routemap.c: (route_set_src_compile) Use '#ifdef HAVE_IPV6'

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 693b3331389776ab6c0509ee32eab61274c58aaf..a85c49fdb008b9fed1540621f86cfeaa63f4a283 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1393,7 +1393,7 @@ rib_add_ipv4_multipath (struct prefix_ipv4 *p, struct rib *rib)
      withdraw. */
   for (same = rn->info; same; same = same->next)
     {
-      if (CHECK_FLAG (rib->status, RIB_ENTRY_REMOVED))
+      if (CHECK_FLAG (same->status, RIB_ENTRY_REMOVED))
         continue;
       
       if (same->type == rib->type && same->table == rib->table