Skip to content

Commit

Permalink
[IPV4] fib_trie: Get rid of trie_init().
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Jan 28, 2008
1 parent 6db105d commit c28a1cf
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -876,19 +876,6 @@ static struct tnode *halve(struct trie *t, struct tnode *tn)
}
}

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 */

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c28a1cf

Please sign in to comment.