diff options
| author | Julian Anastasov <ja@ssi.bg> | 2017-02-11 13:49:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-11 21:25:18 -0500 |
| commit | c16ec18599c8c1722d476011786fd9e2529888f7 (patch) | |
| tree | 0f17b999b254b930081517f6bc64f12b911bff75 /net | |
| parent | 90d2ea9f66d3f9f96bc0f41d94b4830c0b2d0a50 (diff) | |
| download | linux-stable-c16ec18599c8c1722d476011786fd9e2529888f7.tar.gz linux-stable-c16ec18599c8c1722d476011786fd9e2529888f7.tar.bz2 linux-stable-c16ec18599c8c1722d476011786fd9e2529888f7.zip | |
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')
| -rw-r--r-- | net/ipv4/ip_output.c | 2 | ||||
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
2 files changed, 2 insertions, 2 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; 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; } |