]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[IPV4] fib_trie: Get rid of trie_init().
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Sun, 13 Jan 2008 04:49:13 +0000 (20:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:01:52 +0000 (15:01 -0800)
trie_init is worthless it is just zeroing stuff that is already zero!
Move the memset() down to make it obvious.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_trie.c

index aa9deb708dcf65cfaae5097e4296bda89288f1de..0179d245c81fdad9379e3f097a58aa3314d3edca 100644 (file)
@@ -876,19 +876,6 @@ nomem:
        }
 }
 
-static void trie_init(struct trie *t)
-{
-       if (!t)
-               return;
-
-       t->size = 0;
-       rcu_assign_pointer(t->trie, NULL);
-       t->revision = 0;
-#ifdef CONFIG_IP_FIB_TRIE_STATS
-       memset(&t->stats, 0, sizeof(struct trie_use_stats));
-#endif
-}
-
 /* readside must use rcu_read_lock currently dump routines
  via get_fa_head and dump */
 
@@ -1980,11 +1967,9 @@ struct fib_table *fib_hash_init(u32 id)
        tb->tb_flush = fn_trie_flush;
        tb->tb_select_default = fn_trie_select_default;
        tb->tb_dump = fn_trie_dump;
-       memset(tb->tb_data, 0, sizeof(struct trie));
 
        t = (struct trie *) tb->tb_data;
-
-       trie_init(t);
+       memset(t, 0, sizeof(*t));
 
        if (id == RT_TABLE_LOCAL)
                printk(KERN_INFO "IPv4 FIB: Using LC-trie version %s\n", VERSION);