diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-16 17:45:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-16 17:45:02 -0700 |
| commit | b23b5455b6458920179a1f27513ce42e70d11f37 (patch) | |
| tree | d7bd2c13199485c2504d6b315d451cebba6978ae /net/ipv4/route.c | |
| parent | 47ec132a40d788d45e2f088545dea68798034dab (diff) | |
neigh: Kill hh_cache->hh_output
It's just taking on one of two possible values, either
neigh_ops->output or dev_queue_xmit(). And this is purely depending
upon whether nud_state has NUD_CONNECTED set or not.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index a52bb74d261..bcf9bb50820 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -427,9 +427,9 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) dst_metric(&r->dst, RTAX_RTTVAR)), r->rt_key_tos, -1, - (r->dst.neighbour ? - (r->dst.neighbour->hh.hh_output == - dev_queue_xmit) : 0), + (r->dst.neighbour && + (r->dst.neighbour->nud_state & NUD_CONNECTED)) ? + 1 : 0, r->rt_spec_dst, &len); seq_printf(seq, "%*s\n", 127 - len, ""); |