net: add dst_pending_confirm flag to skbuff

[mirror_ubuntu-zesty-kernel.git] / drivers / net / vrf.c

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index f2fd52e71a5ed58f6e238578a08bb7902d6b8595..82232897c994540c719e092b31c1cbf6a10d28a0 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -380,6 +380,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk,
        if (unlikely(!neigh))
                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);
                rcu_read_unlock_bh();
                return ret;
@@ -578,8 +579,10 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s
        neigh = __ipv4_neigh_lookup_noref(dev, nexthop);
        if (unlikely(!neigh))
                neigh = __neigh_create(&arp_tbl, &nexthop, dev, false);
-       if (!IS_ERR(neigh))
+       if (!IS_ERR(neigh)) {
+               sock_confirm_neigh(skb, neigh);
                ret = dst_neigh_output(dst, neigh, skb);
+       }
 
        rcu_read_unlock_bh();
 err: