dccp: use inet6_csk_route_req() helper

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

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 5165571f397aa6d40da19d36287ca8339852ab54..0966bc08d36272c2f320cd6f50533f76c8ad2806 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -181,7 +181,7 @@ out:
 }
 
 
-static int dccp_v6_send_response(struct sock *sk, struct request_sock *req)
+static int dccp_v6_send_response(const struct sock *sk, struct request_sock *req)
 {
        struct inet_request_sock *ireq = inet_rsk(req);
        struct ipv6_pinfo *np = inet6_sk(sk);
@@ -234,7 +234,7 @@ static void dccp_v6_reqsk_destructor(struct request_sock *req)
        kfree_skb(inet_rsk(req)->pktopts);
 }
 
-static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
+static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
 {
        const struct ipv6hdr *rxip6h;
        struct sk_buff *skb;
@@ -462,22 +462,11 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
        if (sk_acceptq_is_full(sk))
                goto out_overflow;
 
-       if (dst == NULL) {
-               struct in6_addr *final_p, final;
+       if (!dst) {
                struct flowi6 fl6;
 
-               memset(&fl6, 0, sizeof(fl6));
-               fl6.flowi6_proto = IPPROTO_DCCP;
-               fl6.daddr = ireq->ir_v6_rmt_addr;
-               final_p = fl6_update_dst(&fl6, np->opt, &final);
-               fl6.saddr = ireq->ir_v6_loc_addr;
-               fl6.flowi6_oif = sk->sk_bound_dev_if;
-               fl6.fl6_dport = ireq->ir_rmt_port;
-               fl6.fl6_sport = htons(ireq->ir_num);
-               security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
-
-               dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
-               if (IS_ERR(dst))
+               dst = inet6_csk_route_req(sk, &fl6, req, IPPROTO_DCCP);
+               if (!dst)
                        goto out;
        }