summaryrefslogtreecommitdiff
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2017-02-11 14:49:20 +0300
committerDavid S. Miller <davem@davemloft.net>2017-02-12 05:25:18 +0300
commitc16ec18599c8c1722d476011786fd9e2529888f7 (patch)
tree0f17b999b254b930081517f6bc64f12b911bff75 /net/ipv4/ip_output.c
parent90d2ea9f66d3f9f96bc0f41d94b4830c0b2d0a50 (diff)
downloadlinux-c16ec18599c8c1722d476011786fd9e2529888f7.tar.xz
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/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 7a719f1ae556..737ce826d7ec 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -225,7 +225,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s
int res;
sock_confirm_neigh(skb, neigh);
- res = dst_neigh_output(dst, neigh, skb);
+ res = neigh_output(neigh, skb);
rcu_read_unlock_bh();
return res;