From 62c714661495057f176d4b2bd5f28bec508fb60e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 2 Jul 2012 02:04:13 -0700 Subject: [PATCH] --- yaml --- r: 314963 b: refs/heads/master c: 3c521f2ba9646c5543963cbc2b9c9d3f02a82594 h: refs/heads/master i: 314961: 30ddf76a9a8a850b0f806df10fde22422f62f7af 314959: 44524ec5c02eb5188c06185848dad08793dbbad9 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 8bc2f8227282..118697cea264 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a263b3093641fb1ec377582c90986a7fd0625184 +refs/heads/master: 3c521f2ba9646c5543963cbc2b9c9d3f02a82594 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 2f40363e2851..bae36386e722 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -418,13 +418,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) "HHUptod\tSpecDst"); else { struct rtable *r = v; - struct neighbour *n; - int len, HHUptod; - - rcu_read_lock(); - n = dst_get_neighbour_noref(&r->dst); - HHUptod = (n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0; - rcu_read_unlock(); + 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", @@ -438,9 +432,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) + dst_metric(&r->dst, RTAX_RTTVAR)), r->rt_key_tos, - -1, - HHUptod, - 0, &len); + -1, 0, 0, &len); seq_printf(seq, "%*s\n", 127 - len, ""); }