diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-02-27 12:13:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-02-27 12:13:50 +0800 |
commit | 0dbbc74421d25e7d490d7426b38f7942011deb4d (patch) | |
tree | 26a9d5968d5d0cd6c8b6fd8dee5cc3fb199e1e6e /drivers/net/vxlan.c | |
parent | e2a316c741e51ce220003d49ea30e25468ca3b0f (diff) | |
parent | 3737a5f7223464efed3b0a9da2b045dae28d3a53 (diff) |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-androidlsk-v4.9-18.05-androidlsk-v4.9-18.03-androidlsk-v4.9-18.02-androidlsk-v4.9-17.11-androidlsk-v4.9-17.09-androidlsk-v4.9-17.08-androidlsk-v4.9-17.06-android
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 0fafaa9d903b..d4f495b41bd4 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2449,7 +2449,8 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) return -EINVAL; rt = vxlan_get_route(vxlan, skb, 0, info->key.tos, info->key.u.ipv4.dst, - &info->key.u.ipv4.src, NULL, info); + &info->key.u.ipv4.src, + &info->dst_cache, info); if (IS_ERR(rt)) return PTR_ERR(rt); ip_rt_put(rt); @@ -2459,7 +2460,8 @@ static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) ndst = vxlan6_get_route(vxlan, skb, 0, info->key.tos, info->key.label, &info->key.u.ipv6.dst, - &info->key.u.ipv6.src, NULL, info); + &info->key.u.ipv6.src, + &info->dst_cache, info); if (IS_ERR(ndst)) return PTR_ERR(ndst); dst_release(ndst); |