lkml.org 
[lkml]   [2007]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 50/59] IPV4: Fix single-entry /proc/net/fib_trie output.
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Robert Olsson <robert.olsson@its.uu.se>

    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>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    net/ipv4/fib_trie.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- linux-2.6.19.2.orig/net/ipv4/fib_trie.c
    +++ linux-2.6.19.2/net/ipv4/fib_trie.c
    @@ -2290,16 +2290,17 @@ static int fib_trie_seq_show(struct seq_
    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,
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-03 03:47    [W:0.024 / U:1.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site