From 35a81d07d58e121116e824d32ddf1edac4a9c5b4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sat, 12 Jan 2008 20:49:13 -0800 Subject: [PATCH] --- yaml --- r: 78774 b: refs/heads/master c: c28a1cf448e59019fa681741963c3acaeaeb6d27 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_trie.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index a379732d513f..2c811ad44984 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6db105db95197c0fe93f8b3fb338eb6cf17440b7 +refs/heads/master: c28a1cf448e59019fa681741963c3acaeaeb6d27 diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c index aa9deb708dcf..0179d245c81f 100644 --- a/trunk/net/ipv4/fib_trie.c +++ b/trunk/net/ipv4/fib_trie.c @@ -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 */ @@ -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);