From c2b2356701607af2bc0f7142eba1f5352b23f901 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 3 Aug 2018 13:25:13 -0400
Subject: [PATCH] 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>
---
 lib/agg_table.h | 2 ++
 lib/table.h     | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/agg_table.h b/lib/agg_table.h
index 65d4137bc27a..235f0d37a390 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 8304abe59b38..711ace111ec1 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. */