]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv4: Don't report neigh uptodate state in rtcache procfs.
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Jul 2012 09:04:13 +0000 (02:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Jul 2012 08:02:31 +0000 (01:02 -0700)
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>
net/ipv4/route.c

index 2f40363e2851385a3f4192503f3e981b46e09c5a..bae36386e7221640f23e2de0e3880abec43ac24d 100644 (file)
@@ -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, "");
        }