zebra: Make RIB_SYSTEM|KERNEL_ROUTE a property of rib.h

These defines should be available from rib.h

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

diff --git a/zebra/rib.h b/zebra/rib.h
index 8a59cea6d0d5a7000c3999958c4d4faf0de0a93f..583c42682a4b5ab5a1e83302a0add5922a4cf5f7 100644 (file)
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -148,6 +148,11 @@ struct route_entry {
        uint32_t dplane_sequence;
 };
 
+#define RIB_SYSTEM_ROUTE(R)                                                    \
+       ((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)
+
+#define RIB_KERNEL_ROUTE(R) ((R)->type == ZEBRA_ROUTE_KERNEL)
+
 /* meta-queue structure:
  * sub-queue 0: connected, kernel
  * sub-queue 1: static

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 3623852afd0bab61071c9a930661420f33ea9ab9..bcad6d17b60b9cd91a9e41b0375053ae19b45f5f 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -797,12 +797,6 @@ struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, vrf_id_t vrf_id)
        return NULL;
 }
 
-#define RIB_SYSTEM_ROUTE(R)                                                    \
-       ((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)
-
-#define RIB_KERNEL_ROUTE(R)                                            \
-       ((R)->type == ZEBRA_ROUTE_KERNEL)
-
 /* This function verifies reachability of one given nexthop, which can be
  * numbered or unnumbered, IPv4 or IPv6. The result is unconditionally stored
  * in nexthop->flags field. The nexthop->ifindex will be updated