The revision element must of been part of an earlier design,
because currently it is set but never used.

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>


--- a/net/ipv4/fib_trie.c       2008-01-11 22:18:34.000000000 -0800
+++ b/net/ipv4/fib_trie.c       2008-01-11 22:26:34.000000000 -0800
@@ -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
 
                if (!li) {
                        *err = -ENOMEM;
-                       goto err;
+                       goto done;
                }
 
                fa_head = &li->falh;
@@ -1058,7 +1057,7 @@ fib_insert_node(struct trie *t, int *err
 
        if (!l) {
                *err = -ENOMEM;
-               goto err;
+               goto done;
        }
 
        l->key = key;
@@ -1067,7 +1066,7 @@ fib_insert_node(struct trie *t, int *err
        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
                        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
 
        rcu_assign_pointer(t->trie, trie_rebalance(t, tp));
 done:
-       t->revision++;
-err:
        return fa_head;
 }
 
@@ -1543,7 +1540,6 @@ static int trie_leaf_remove(struct trie 
         * Remove the leaf and rebalance the tree
         */
 
-       t->revision++;
        t->size--;
 
        tp = node_parent(n);
@@ -1749,8 +1745,6 @@ static int fn_trie_flush(struct fib_tabl
        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);
 

-- 
Stephen Hemminger <[EMAIL PROTECTED]>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to