diff options
| author | Julian Anastasov <ja@ssi.bg> | 2017-02-06 22:14:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-07 19:07:46 +0100 |
| commit | 4ff0620354f2b39b9fe2a91c22c4de9d1fba0c8e (patch) | |
| tree | 1d29569c1059553f11c2da53df68f3698df92906 /drivers/net/vrf.c | |
| parent | sock: add sk_dst_pending_confirm flag (diff) | |
| download | linux-4ff0620354f2b39b9fe2a91c22c4de9d1fba0c8e.tar.xz linux-4ff0620354f2b39b9fe2a91c22c4de9d1fba0c8e.zip | |
net: add dst_pending_confirm flag to skbuff
Add new skbuff flag to allow protocols to confirm neighbour.
When same struct dst_entry can be used for many different
neighbours we can not use it for pending confirmations.
Add sock_confirm_neigh() helper to confirm the neighbour and
use it for IPv4, IPv6 and VRF before dst_neigh_output.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vrf.c')
| -rw-r--r-- | drivers/net/vrf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 264fc1585b3c..630eafdb79e8 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -378,6 +378,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; @@ -574,8 +575,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: |