diff options
author | Robert Olsson <robert.olsson@its.uu.se> | 2007-01-26 22:06:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-01-26 22:06:01 -0500 |
commit | 095b8501e4168ae5a879fcb9420ac48cbd43f95a (patch) | |
tree | 18246d3c3a835bf899eeab336d4efd6fd237ad6e | |
parent | 342a0cff0ad5fba6b591cfa37db3c65c4d9913f8 (diff) |
[IPV4]: Fix single-entry /proc/net/fib_trie output.
When main table is just a single leaf this gets printed as belonging to the
local table in /proc/net/fib_trie. A fix is below.
Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/fib_trie.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 13307c04d5a1..1e589b91605e 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -2290,16 +2290,17 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v) | |||
2290 | if (v == SEQ_START_TOKEN) | 2290 | if (v == SEQ_START_TOKEN) |
2291 | return 0; | 2291 | return 0; |
2292 | 2292 | ||
2293 | if (!NODE_PARENT(n)) { | ||
2294 | if (iter->trie == trie_local) | ||
2295 | seq_puts(seq, "<local>:\n"); | ||
2296 | else | ||
2297 | seq_puts(seq, "<main>:\n"); | ||
2298 | } | ||
2299 | |||
2293 | if (IS_TNODE(n)) { | 2300 | if (IS_TNODE(n)) { |
2294 | struct tnode *tn = (struct tnode *) n; | 2301 | struct tnode *tn = (struct tnode *) n; |
2295 | __be32 prf = htonl(MASK_PFX(tn->key, tn->pos)); | 2302 | __be32 prf = htonl(MASK_PFX(tn->key, tn->pos)); |
2296 | 2303 | ||
2297 | if (!NODE_PARENT(n)) { | ||
2298 | if (iter->trie == trie_local) | ||
2299 | seq_puts(seq, "<local>:\n"); | ||
2300 | else | ||
2301 | seq_puts(seq, "<main>:\n"); | ||
2302 | } | ||
2303 | seq_indent(seq, iter->depth-1); | 2304 | seq_indent(seq, iter->depth-1); |
2304 | seq_printf(seq, " +-- %d.%d.%d.%d/%d %d %d %d\n", | 2305 | seq_printf(seq, " +-- %d.%d.%d.%d/%d %d %d %d\n", |
2305 | NIPQUAD(prf), tn->pos, tn->bits, tn->full_children, | 2306 | NIPQUAD(prf), tn->pos, tn->bits, tn->full_children, |