diff options
| author | Robert Olsson <robert.olsson@its.uu.se> | 2007-01-27 04:06:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-01-27 04:06:01 +0100 |
| commit | 095b8501e4168ae5a879fcb9420ac48cbd43f95a (patch) | |
| tree | 18246d3c3a835bf899eeab336d4efd6fd237ad6e /net/ipv4 | |
| parent | [SELINUX]: Fix 2.6.20-rc6 build when no xfrm (diff) | |
| download | linux-095b8501e4168ae5a879fcb9420ac48cbd43f95a.tar.xz linux-095b8501e4168ae5a879fcb9420ac48cbd43f95a.zip | |
[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>
Diffstat (limited to 'net/ipv4')
| -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) if (v == SEQ_START_TOKEN) return 0; + if (!NODE_PARENT(n)) { + if (iter->trie == trie_local) + seq_puts(seq, "<local>:\n"); + else + seq_puts(seq, "<main>:\n"); + } + if (IS_TNODE(n)) { struct tnode *tn = (struct tnode *) n; __be32 prf = htonl(MASK_PFX(tn->key, tn->pos)); - if (!NODE_PARENT(n)) { - if (iter->trie == trie_local) - seq_puts(seq, "<local>:\n"); - else - seq_puts(seq, "<main>:\n"); - } seq_indent(seq, iter->depth-1); seq_printf(seq, " +-- %d.%d.%d.%d/%d %d %d %d\n", NIPQUAD(prf), tn->pos, tn->bits, tn->full_children, |