diff options
| author | Stephen Hemminger | 2008-01-13 05:49:13 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-29 00:01:52 +0100 |
| commit | c28a1cf448e59019fa681741963c3acaeaeb6d27 (patch) | |
| tree | 2591d9f8bdadc11b49e3d55f5be1f467eedc2c9f /net/ipv4/fib_trie.c | |
| parent | [PKTGEN]: uninline getCurUs (diff) | |
| download | kernel-qcow2-linux-c28a1cf448e59019fa681741963c3acaeaeb6d27.tar.gz kernel-qcow2-linux-c28a1cf448e59019fa681741963c3acaeaeb6d27.tar.xz kernel-qcow2-linux-c28a1cf448e59019fa681741963c3acaeaeb6d27.zip | |
[IPV4] fib_trie: Get rid of trie_init().
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>
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index aa9deb708dcf..0179d245c81f 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -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); |