aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-01-12 23:49:13 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:01:52 -0500
commitc28a1cf448e59019fa681741963c3acaeaeb6d27 (patch)
tree2591d9f8bdadc11b49e3d55f5be1f467eedc2c9f /net/ipv4
parent6db105db95197c0fe93f8b3fb338eb6cf17440b7 (diff)
[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')
-rw-r--r--net/ipv4/fib_trie.c17
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:
876 } 876 }
877} 877}
878 878
879static void trie_init(struct trie *t)
880{
881 if (!t)
882 return;
883
884 t->size = 0;
885 rcu_assign_pointer(t->trie, NULL);
886 t->revision = 0;
887#ifdef CONFIG_IP_FIB_TRIE_STATS
888 memset(&t->stats, 0, sizeof(struct trie_use_stats));
889#endif
890}
891
892/* readside must use rcu_read_lock currently dump routines 879/* readside must use rcu_read_lock currently dump routines
893 via get_fa_head and dump */ 880 via get_fa_head and dump */
894 881
@@ -1980,11 +1967,9 @@ struct fib_table *fib_hash_init(u32 id)
1980 tb->tb_flush = fn_trie_flush; 1967 tb->tb_flush = fn_trie_flush;
1981 tb->tb_select_default = fn_trie_select_default; 1968 tb->tb_select_default = fn_trie_select_default;
1982 tb->tb_dump = fn_trie_dump; 1969 tb->tb_dump = fn_trie_dump;
1983 memset(tb->tb_data, 0, sizeof(struct trie));
1984 1970
1985 t = (struct trie *) tb->tb_data; 1971 t = (struct trie *) tb->tb_data;
1986 1972 memset(t, 0, sizeof(*t));
1987 trie_init(t);
1988 1973
1989 if (id == RT_TABLE_LOCAL) 1974 if (id == RT_TABLE_LOCAL)
1990 printk(KERN_INFO "IPv4 FIB: Using LC-trie version %s\n", VERSION); 1975 printk(KERN_INFO "IPv4 FIB: Using LC-trie version %s\n", VERSION);