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>

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 6e74b3f110bcdd7980aeda4387f4b51894449c5e..707027fae8abedfca117422db7c710a1b2973f2b 100644 (file)
--- 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 72e88c208025252422d07d96a38c5f7caa145fe8..d02c91177d32f0d9ac1e6a6402441ea5c46b00a4 100644 (file)
--- 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, "");
        }