diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-19 17:18:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-19 17:18:46 +0100 |
| commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
| tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /drivers/net/vxlan.c | |
| parent | tcp: use page_ref_inc() in tcp_sendmsg() (diff) | |
| parent | ipv6: release dst on error in ip6_dst_lookup_tail (diff) | |
| download | linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.xz linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 4e27c5b09600..c5db8f8563c1 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2489,7 +2489,8 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) rt = vxlan_get_route(vxlan, dev, sock4, skb, 0, info->key.tos, info->key.u.ipv4.dst, - &info->key.u.ipv4.src, dport, sport, NULL, info); + &info->key.u.ipv4.src, dport, sport, + &info->dst_cache, info); if (IS_ERR(rt)) return PTR_ERR(rt); ip_rt_put(rt); @@ -2500,7 +2501,8 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) ndst = vxlan6_get_route(vxlan, dev, sock6, skb, 0, info->key.tos, info->key.label, &info->key.u.ipv6.dst, - &info->key.u.ipv6.src, dport, sport, NULL, info); + &info->key.u.ipv6.src, dport, sport, + &info->dst_cache, info); if (IS_ERR(ndst)) return PTR_ERR(ndst); dst_release(ndst); |