ipv6: Convert to use flowi6 where applicable.

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / syncookies.c

diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 5b9eded1432cc993b6b166e39acf3455f60a4fd3..97858d5d67e8071945a746a302c52a28077e46d4 100644 (file)
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -232,19 +232,19 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
         */
        {
                struct in6_addr *final_p, final;
-               struct flowi fl;
-               memset(&fl, 0, sizeof(fl));
-               fl.flowi_proto = IPPROTO_TCP;
-               ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);
-               final_p = fl6_update_dst(&fl, np->opt, &final);
-               ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr);
-               fl.flowi_oif = sk->sk_bound_dev_if;
-               fl.flowi_mark = sk->sk_mark;
-               fl.fl6_dport = inet_rsk(req)->rmt_port;
-               fl.fl6_sport = inet_sk(sk)->inet_sport;
-               security_req_classify_flow(req, &fl);
-
-               dst = ip6_dst_lookup_flow(sk, &fl, final_p, false);
+               struct flowi6 fl6;
+               memset(&fl6, 0, sizeof(fl6));
+               fl6.flowi6_proto = IPPROTO_TCP;
+               ipv6_addr_copy(&fl6.daddr, &ireq6->rmt_addr);
+               final_p = fl6_update_dst(&fl6, np->opt, &final);
+               ipv6_addr_copy(&fl6.saddr, &ireq6->loc_addr);
+               fl6.flowi6_oif = sk->sk_bound_dev_if;
+               fl6.flowi6_mark = sk->sk_mark;
+               fl6.uli.ports.dport = inet_rsk(req)->rmt_port;
+               fl6.uli.ports.sport = inet_sk(sk)->inet_sport;
+               security_req_classify_flow(req, flowi6_to_flowi(&fl6));
+
+               dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
                if (IS_ERR(dst))
                        goto out_free;
        }