summaryrefslogtreecommitdiff
path: root/drivers/net/vrf.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 /drivers/net/vrf.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 'drivers/net/vrf.c')
-rw-r--r--drivers/net/vrf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 630eafdb79e8..22379da63400 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -379,7 +379,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk,
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;
}
@@ -577,7 +577,7 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s
neigh = __neigh_create(&arp_tbl, &nexthop, 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();