diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-16 17:26:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-16 17:26:00 -0700 |
| commit | 05e3aa0949c138803185f92bd7db9be59cfca1be (patch) | |
| tree | 8ea4dd1ab94160dfe51d3d0c0d305d20f2a62a04 /net/ipv6/ip6_output.c | |
| parent | a29282972cc9b80126d4e4d68251c6712bdad051 (diff) | |
| download | olio-linux-3.10-05e3aa0949c138803185f92bd7db9be59cfca1be.tar.xz olio-linux-3.10-05e3aa0949c138803185f92bd7db9be59cfca1be.zip | |
net: Create and use new helper, neigh_output().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 36362e9513f..eb50bb07ab2 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -136,13 +136,9 @@ static int ip6_finish_output2(struct sk_buff *skb) } neigh = dst->neighbour; - if (neigh) { - struct hh_cache *hh = &neigh->hh; - if (hh->hh_len) - return neigh_hh_output(hh, skb); - else - return neigh->output(skb); - } + if (neigh) + return neigh_output(neigh, skb); + IP6_INC_STATS_BH(dev_net(dst->dev), ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES); kfree_skb(skb); |