Merge pull request #5722 from donaldsharp/kernel_routes

Kernel routes

diff --combined zebra/zebra_rib.c
index 6276a5d8b30961ba022d48430a2babfaf74302b0,0200ef2a5e0b88207b8299400d39123dea2a7603..f3112cc9c039bd564819e75cd8190fe60d529d95
--- 1/zebra/zebra_rib.c
--- 2/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@@ -1075,7 -1075,8 +1075,8 @@@ static void rib_process(struct route_no
                }
  
                /* Infinite distance. */
-               if (re->distance == DISTANCE_INFINITY) {
+               if (re->distance == DISTANCE_INFINITY &&
+                   re->type != ZEBRA_ROUTE_KERNEL) {
                        UNSET_FLAG(re->status, ROUTE_ENTRY_CHANGED);
                        continue;
                }
@@@ -3114,6 -3115,8 +3115,6 @@@ static struct rib_update_ctx *rib_updat
  static void rib_update_ctx_fini(struct rib_update_ctx **ctx)
  {
        XFREE(MTYPE_RIB_UPDATE_CTX, *ctx);
 -
 -      *ctx = NULL;
  }
  
  static int rib_update_handler(struct thread *thread)