diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-06 01:59:02 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-06 01:59:02 +0400 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /net/ipv4/fib_trie.c | |
| parent | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (diff) | |
| parent | 87e9af6cc67d842cd92b52b81f3f14e665e7ab05 (diff) | |
| download | linux-7143b7d41218d4fc2ea33e6056c73609527ae687.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 9ac481a10d37..6375c1c5f642 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1998,9 +1998,6 @@ struct fib_table *fib_trie_table(u32 id) t = (struct trie *) tb->tb_data; memset(t, 0, sizeof(*t)); - if (id == RT_TABLE_LOCAL) - pr_info("IPv4 FIB: Using LC-trie version %s\n", VERSION); - return tb; } |