Merge pull request #3356 from opensourcerouting/router-id-loopbacks

[mirror_frr.git] / lib / table.h

diff --git a/lib/table.h b/lib/table.h
index ac7df3e6950b455a93c95354620e2e204baf2293..541d74d77bff9f1c3b32d000acc4dfa6ad43bdd1 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. */
@@ -182,6 +179,16 @@ route_table_init_with_delegate(route_table_delegate_t *delegate);
 
 extern route_table_delegate_t *route_table_get_default_delegate(void);
 
+static inline void *route_table_get_info(struct route_table *table)
+{
+       return table->info;
+}
+
+static inline void route_table_set_info(struct route_table *table, void *d)
+{
+       table->info = d;
+}
+
 extern void route_table_finish(struct route_table *table);
 extern struct route_node *route_top(struct route_table *table);
 extern struct route_node *route_next(struct route_node *node);
@@ -235,17 +242,13 @@ static inline struct route_node *route_lock_node(struct route_node *node)
 }
 
 /* Unlock node. */
-static inline struct route_node *route_unlock_node(struct route_node *node)
+static inline void route_unlock_node(struct route_node *node)
 {
        assert(node->lock > 0);
        (*(unsigned *)&node->lock)--;
 
-       if (node->lock == 0) {
+       if (node->lock == 0)
                route_node_delete(node);
-               return NULL;
-       }
-
-       return node;
 }
 
 /*