Commit 93e4308b authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

[IPV4] fib_trie: Get rid of unused revision element.

The revision element must of been part of an earlier design, because
currently it is set but never used.
Signed-off-by: default avatarStephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c28a1cf4
...@@ -153,7 +153,6 @@ struct trie { ...@@ -153,7 +153,6 @@ struct trie {
struct trie_use_stats stats; struct trie_use_stats stats;
#endif #endif
int size; int size;
unsigned int revision;
}; };
static void put_child(struct trie *t, struct tnode *tn, int i, struct node *n); static void put_child(struct trie *t, struct tnode *tn, int i, struct node *n);
...@@ -1046,7 +1045,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) ...@@ -1046,7 +1045,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
if (!li) { if (!li) {
*err = -ENOMEM; *err = -ENOMEM;
goto err; goto done;
} }
fa_head = &li->falh; fa_head = &li->falh;
...@@ -1058,7 +1057,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) ...@@ -1058,7 +1057,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
if (!l) { if (!l) {
*err = -ENOMEM; *err = -ENOMEM;
goto err; goto done;
} }
l->key = key; l->key = key;
...@@ -1067,7 +1066,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) ...@@ -1067,7 +1066,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
if (!li) { if (!li) {
tnode_free((struct tnode *) l); tnode_free((struct tnode *) l);
*err = -ENOMEM; *err = -ENOMEM;
goto err; goto done;
} }
fa_head = &li->falh; fa_head = &li->falh;
...@@ -1104,7 +1103,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) ...@@ -1104,7 +1103,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
free_leaf_info(li); free_leaf_info(li);
tnode_free((struct tnode *) l); tnode_free((struct tnode *) l);
*err = -ENOMEM; *err = -ENOMEM;
goto err; goto done;
} }
node_set_parent((struct node *)tn, tp); node_set_parent((struct node *)tn, tp);
...@@ -1130,8 +1129,6 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) ...@@ -1130,8 +1129,6 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
rcu_assign_pointer(t->trie, trie_rebalance(t, tp)); rcu_assign_pointer(t->trie, trie_rebalance(t, tp));
done: done:
t->revision++;
err:
return fa_head; return fa_head;
} }
...@@ -1546,7 +1543,6 @@ static int trie_leaf_remove(struct trie *t, t_key key) ...@@ -1546,7 +1543,6 @@ static int trie_leaf_remove(struct trie *t, t_key key)
* Remove the leaf and rebalance the tree * Remove the leaf and rebalance the tree
*/ */
t->revision++;
t->size--; t->size--;
tp = node_parent(n); tp = node_parent(n);
...@@ -1752,8 +1748,6 @@ static int fn_trie_flush(struct fib_table *tb) ...@@ -1752,8 +1748,6 @@ static int fn_trie_flush(struct fib_table *tb)
struct leaf *ll = NULL, *l = NULL; struct leaf *ll = NULL, *l = NULL;
int found = 0, h; int found = 0, h;
t->revision++;
for (h = 0; (l = nextleaf(t, l)) != NULL; h++) { for (h = 0; (l = nextleaf(t, l)) != NULL; h++) {
found += trie_flush_leaf(t, l); found += trie_flush_leaf(t, l);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment