From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 29 Jan 2019 19:06:25 +0000 (-0500)
Subject: zebra: Make RIB_SYSTEM|KERNEL_ROUTE a property of rib.h
X-Git-Tag: frr-7.2~379^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=84340a15b4e436c2c9d007a157fb71d7f2f58d01;p=mirror_frr.git

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 8a59cea6d..583c42682 100644
--- 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 3623852af..bcad6d17b 100644
--- 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