summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2017-02-11 13:49:20 +0200
committerDavid S. Miller <davem@davemloft.net>2017-02-11 21:25:18 -0500
commitc16ec18599c8c1722d476011786fd9e2529888f7 (patch)
tree0f17b999b254b930081517f6bc64f12b911bff75 /net/ipv6/ip6_output.c
parent90d2ea9f66d3f9f96bc0f41d94b4830c0b2d0a50 (diff)
net: rename dst_neigh_output back to neigh_output
After the dst->pending_confirm flag was removed, we do not need anymore to provide dst arg to dst_neigh_output. So, rename it to neigh_output as before commit 5110effee8fd ("net: Do delayed neigh confirmation."). Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d299040613a0..a75871c62328 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -120,7 +120,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh);
- ret = dst_neigh_output(dst, neigh, skb);
+ ret = neigh_output(neigh, skb);
rcu_read_unlock_bh();
return ret;
}