diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:08 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:08 +0800 |
commit | 96195c7a758055f7c1a77b7070050c12eb949883 (patch) | |
tree | c7327af2be21ef3c4a6a712a2f9f345b16197a02 /net/ipv6/ip6_output.c | |
parent | c8a04d19821f8ee3ba047681cf23f46722caf596 (diff) | |
parent | ffc4aa8f521606f63f59ff708f49780172909e94 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.06-rt
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index a175152d3e46..58900c21e4e4 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1072,17 +1072,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6, const struct in6_addr *final_dst) { struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie); - int err; dst = ip6_sk_dst_check(sk, dst, fl6); + if (!dst) + dst = ip6_dst_lookup_flow(sk, fl6, final_dst); - err = ip6_dst_lookup_tail(sock_net(sk), sk, &dst, fl6); - if (err) - return ERR_PTR(err); - if (final_dst) - fl6->daddr = *final_dst; - - return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0); + return dst; } EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow); |