diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-14 10:53:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-14 10:53:20 -0400 |
commit | f6b72b6217f8c24f2a54988e58af858b4e66024d (patch) | |
tree | c59d5adcf9bb226db6f602c5078106052524cfea /net/ipv4/route.c | |
parent | 390fd0b388e4f85549e5d60bdeb21364b344d9b9 (diff) |
net: Embed hh_cache inside of struct neighbour.
Now that there is a one-to-one correspondance between neighbour
and hh_cache entries, we no longer need:
1) dynamic allocation
2) attachment to dst->hh
3) refcounting
Initialization of the hh_cache entry is indicated by hh_len
being non-zero, and such initialization is always done with
the neighbour's lock held as a writer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index c6388e825ed3..a52bb74d2612 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -426,9 +426,10 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) | |||
426 | (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) + | 426 | (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) + |
427 | dst_metric(&r->dst, RTAX_RTTVAR)), | 427 | dst_metric(&r->dst, RTAX_RTTVAR)), |
428 | r->rt_key_tos, | 428 | r->rt_key_tos, |
429 | r->dst.hh ? atomic_read(&r->dst.hh->hh_refcnt) : -1, | 429 | -1, |
430 | r->dst.hh ? (r->dst.hh->hh_output == | 430 | (r->dst.neighbour ? |
431 | dev_queue_xmit) : 0, | 431 | (r->dst.neighbour->hh.hh_output == |
432 | dev_queue_xmit) : 0), | ||
432 | r->rt_spec_dst, &len); | 433 | r->rt_spec_dst, &len); |
433 | 434 | ||
434 | seq_printf(seq, "%*s\n", 127 - len, ""); | 435 | seq_printf(seq, "%*s\n", 127 - len, ""); |