aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-02 05:04:13 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-05 04:02:31 -0400
commit3c521f2ba9646c5543963cbc2b9c9d3f02a82594 (patch)
tree46dd33ac64e16ad87c946fbf9bbf744203d2fa43 /net
parenta263b3093641fb1ec377582c90986a7fd0625184 (diff)
ipv4: Don't report neigh uptodate state in rtcache procfs.
Soon routes will not have a cached neigh attached, nor will we be able to necessarily go directly to a neigh from an arbitrary route. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/route.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 2f40363e2851..bae36386e722 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -418,13 +418,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v)
418 "HHUptod\tSpecDst"); 418 "HHUptod\tSpecDst");
419 else { 419 else {
420 struct rtable *r = v; 420 struct rtable *r = v;
421 struct neighbour *n; 421 int len;
422 int len, HHUptod;
423
424 rcu_read_lock();
425 n = dst_get_neighbour_noref(&r->dst);
426 HHUptod = (n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0;
427 rcu_read_unlock();
428 422
429 seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t" 423 seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t"
430 "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n", 424 "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n",
@@ -438,9 +432,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v)
438 (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) + 432 (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) +
439 dst_metric(&r->dst, RTAX_RTTVAR)), 433 dst_metric(&r->dst, RTAX_RTTVAR)),
440 r->rt_key_tos, 434 r->rt_key_tos,
441 -1, 435 -1, 0, 0, &len);
442 HHUptod,
443 0, &len);
444 436
445 seq_printf(seq, "%*s\n", 127 - len, ""); 437 seq_printf(seq, "%*s\n", 127 - len, "");
446 } 438 }