Merge remote-tracking branch 'origin/cmaster' into cmaster-next

[mirror_frr.git] / zebra / zebra_rnh.c

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index be1411091427ae303dee4e97847f15a9c279c65b..8df9277cb34c74b9e8f29e66a6af55c2111fc976 100644 (file)
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -48,6 +48,7 @@
 #include "zebra/zebra_rnh.h"
 #include "zebra/zebra_routemap.h"
 #include "zebra/interface.h"
+#include "zebra/zebra_memory.h"
 
 static void free_state(vrf_id_t vrf_id, struct rib *rib, struct route_node *rn);
 static void copy_state(struct rnh *rnh, struct rib *rib,
@@ -589,7 +590,7 @@ zebra_rnh_process_static_routes (vrf_id_t vrfid, int family,
                           vrfid, bufn, bufs);
            }
 
-          SET_FLAG(srib->flags, ZEBRA_FLAG_CHANGED);
+          SET_FLAG(srib->status, RIB_ENTRY_CHANGED);
           SET_FLAG(srib->status, RIB_ENTRY_NEXTHOPS_CHANGED);
         }
 
@@ -885,21 +886,21 @@ send_client (struct rnh *rnh, struct zserv *client, rnh_type_t type, vrf_id_t vr
            stream_putc (s, nexthop->type);
            switch (nexthop->type)
              {
-             case ZEBRA_NEXTHOP_IPV4:
+             case NEXTHOP_TYPE_IPV4:
                stream_put_in_addr (s, &nexthop->gate.ipv4);
                break;
-             case ZEBRA_NEXTHOP_IFINDEX:
+             case NEXTHOP_TYPE_IFINDEX:
                stream_putl (s, nexthop->ifindex);
                break;
-             case ZEBRA_NEXTHOP_IPV4_IFINDEX:
+             case NEXTHOP_TYPE_IPV4_IFINDEX:
                stream_put_in_addr (s, &nexthop->gate.ipv4);
                stream_putl (s, nexthop->ifindex);
                break;
 #ifdef HAVE_IPV6
-             case ZEBRA_NEXTHOP_IPV6:
+             case NEXTHOP_TYPE_IPV6:
                stream_put (s, &nexthop->gate.ipv6, 16);
                break;
-             case ZEBRA_NEXTHOP_IPV6_IFINDEX:
+             case NEXTHOP_TYPE_IPV6_IFINDEX:
                stream_put (s, &nexthop->gate.ipv6, 16);
                stream_putl (s, nexthop->ifindex);
                break;