From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 3 Aug 2018 17:25:13 +0000 (-0400)
Subject: lib: Move aggregate pointer into aggregate route/table
X-Git-Tag: frr-7.1-dev~407^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c2b2356701607af2bc0f7142eba1f5352b23f901;p=matthieu%2Ffrr.git

lib: Move aggregate pointer into aggregate route/table

Move the aggregate pointer from the route_node into agg_node
so that people using struct route_node will see a savings
in data size.

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

diff --git a/lib/agg_table.h b/lib/agg_table.h
index 65d4137bc2..235f0d37a3 100644
--- a/lib/agg_table.h
+++ b/lib/agg_table.h
@@ -37,6 +37,8 @@ struct agg_node {
 	 */
 	ROUTE_NODE_FIELDS
 
+	/* Aggregation. */
+	void *aggregate;
 };
 
 static inline struct route_node *agg_node_to_rnode(struct agg_node *node)
diff --git a/lib/table.h b/lib/table.h
index 8304abe59b..711ace111e 100644
--- a/lib/table.h
+++ b/lib/table.h
@@ -126,9 +126,6 @@ struct route_table {
                                                                                \
 	/* Each node of route. */                                              \
 	void *info;                                                            \
-                                                                               \
-	/* Aggregation. */                                                     \
-	void *aggregate;
 
 
 /* Each routing entry. */