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 65d4137bc27a26a6e7e4fb89d79bbd11d49a9e22..235f0d37a390ef3417a11aa468c0bb61582fe235 100644 (file)
--- 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 8304abe59b38ec5b3b349b1848a412ccf266a9a3..711ace111ec15a39d9ee9d611908f3718bc665f4 100644 (file)
--- 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. */