diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-10 00:52:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-10 22:40:06 -0700 |
| commit | 794785bf12d5d6ad7f557d78d203bb0bbfcd8da2 (patch) | |
| tree | f3f869abc60b3bec84528bdf9a84d73824037dae | |
| parent | 51c5d0c4b169bf762f09e0d5b283a7f0b2a45739 (diff) | |
| download | linux-stable-794785bf12d5d6ad7f557d78d203bb0bbfcd8da2.tar.gz linux-stable-794785bf12d5d6ad7f557d78d203bb0bbfcd8da2.tar.bz2 linux-stable-794785bf12d5d6ad7f557d78d203bb0bbfcd8da2.zip | |
net: Don't report route RTT metric value in cache dumps.
We don't maintain it dynamically any longer, so reporting it would
be extremely misleading. Report zero instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/decnet/dn_route.c | 11 | ||||
| -rw-r--r-- | net/ipv4/route.c | 22 |
2 files changed, 15 insertions, 18 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 6e74b3f110bc..707027fae8ab 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -1812,12 +1812,11 @@ static int dn_rt_cache_seq_show(struct seq_file *seq, void *v) char buf1[DN_ASCBUF_LEN], buf2[DN_ASCBUF_LEN]; seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n", - rt->dst.dev ? rt->dst.dev->name : "*", - dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1), - dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2), - atomic_read(&rt->dst.__refcnt), - rt->dst.__use, - (int) dst_metric(&rt->dst, RTAX_RTT)); + rt->dst.dev ? rt->dst.dev->name : "*", + dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1), + dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2), + atomic_read(&rt->dst.__refcnt), + rt->dst.__use, 0); return 0; } diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 72e88c208025..d02c91177d32 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -423,18 +423,16 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) int len; seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t" - "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n", - r->dst.dev ? r->dst.dev->name : "*", - (__force u32)r->rt_dst, - (__force u32)r->rt_gateway, - r->rt_flags, atomic_read(&r->dst.__refcnt), - r->dst.__use, 0, (__force u32)r->rt_src, - dst_metric_advmss(&r->dst) + 40, - dst_metric(&r->dst, RTAX_WINDOW), - (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) + - dst_metric(&r->dst, RTAX_RTTVAR)), - r->rt_key_tos, - -1, 0, 0, &len); + "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n", + r->dst.dev ? r->dst.dev->name : "*", + (__force u32)r->rt_dst, + (__force u32)r->rt_gateway, + r->rt_flags, atomic_read(&r->dst.__refcnt), + r->dst.__use, 0, (__force u32)r->rt_src, + dst_metric_advmss(&r->dst) + 40, + dst_metric(&r->dst, RTAX_WINDOW), 0, + r->rt_key_tos, + -1, 0, 0, &len); seq_printf(seq, "%*s\n", 127 - len, ""); } |