diff options
| author |   Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-01-12 20:50:23 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 15:01:53 -0800 |
| commit | 93e4308b3bea445dc2d3e3c1897a93fe111eba17 (patch) | |
| tree | 1fa726f06cf03116cefccb6f6cfd9e8bd91745eb /net/ipv4/fib_trie.c | |
| parent | [IPV4] fib_trie: Get rid of trie_init(). (diff) | |
| download | linux-dev-93e4308b3bea445dc2d3e3c1897a93fe111eba17.tar.xz linux-dev-93e4308b3bea445dc2d3e3c1897a93fe111eba17.zip | |
[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: Stephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 0179d245c81f..95a62aae5f48 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -153,7 +153,6 @@ struct trie { struct trie_use_stats stats; #endif int size; - unsigned int revision; }; 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) if (!li) { *err = -ENOMEM; - goto err; + goto done; } fa_head = &li->falh; @@ -1058,7 +1057,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) if (!l) { *err = -ENOMEM; - goto err; + goto done; } l->key = key; @@ -1067,7 +1066,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) if (!li) { tnode_free((struct tnode *) l); *err = -ENOMEM; - goto err; + goto done; } fa_head = &li->falh; @@ -1104,7 +1103,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) free_leaf_info(li); tnode_free((struct tnode *) l); *err = -ENOMEM; - goto err; + goto done; } node_set_parent((struct node *)tn, tp); @@ -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)); done: - t->revision++; -err: return fa_head; } @@ -1546,7 +1543,6 @@ static int trie_leaf_remove(struct trie *t, t_key key) * Remove the leaf and rebalance the tree */ - t->revision++; t->size--; tp = node_parent(n); @@ -1752,8 +1748,6 @@ static int fn_trie_flush(struct fib_table *tb) struct leaf *ll = NULL, *l = NULL; int found = 0, h; - t->revision++; - for (h = 0; (l = nextleaf(t, l)) != NULL; h++) { found += trie_flush_leaf(t, l); |