Commit 3c521f2b authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent a263b309

net/ipv4/route.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -418,13 +418,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) 
			   "HHUptod\tSpecDst");

			   "HHUptod\tSpecDst");

	else {

	else {

		struct rtable *r = v;

		struct rtable *r = v;

		struct neighbour *n;

		int len;

		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();





		seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t"

		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",

			      "%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) +

			(int)((dst_metric(&r->dst, RTAX_RTT) >> 3) +

			      dst_metric(&r->dst, RTAX_RTTVAR)),

			      dst_metric(&r->dst, RTAX_RTTVAR)),

			r->rt_key_tos,

			r->rt_key_tos,

			-1,

			-1, 0, 0, &len);

			HHUptod,

			0, &len);





		seq_printf(seq, "%*s\n", 127 - len, "");

		seq_printf(seq, "%*s\n", 127 - len, "");

	}

	}