aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index ed6202652bcc..d75ce8c7e488 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -636,11 +636,8 @@ static struct request_sock_ops dccp_request_sock_ops __read_mostly = {
636int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 636int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
637{ 637{
638 struct inet_request_sock *ireq; 638 struct inet_request_sock *ireq;
639 struct dccp_sock dp;
640 struct request_sock *req; 639 struct request_sock *req;
641 struct dccp_request_sock *dreq; 640 struct dccp_request_sock *dreq;
642 const __be32 saddr = skb->nh.iph->saddr;
643 const __be32 daddr = skb->nh.iph->daddr;
644 const __be32 service = dccp_hdr_request(skb)->dccph_req_service; 641 const __be32 service = dccp_hdr_request(skb)->dccph_req_service;
645 struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); 642 struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
646 __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY; 643 __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
@@ -680,14 +677,14 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
680 if (dccp_parse_options(sk, skb)) 677 if (dccp_parse_options(sk, skb))
681 goto drop_and_free; 678 goto drop_and_free;
682 679
683 dccp_openreq_init(req, &dp, skb); 680 dccp_reqsk_init(req, skb);
684 681
685 if (security_inet_conn_request(sk, skb, req)) 682 if (security_inet_conn_request(sk, skb, req))
686 goto drop_and_free; 683 goto drop_and_free;
687 684
688 ireq = inet_rsk(req); 685 ireq = inet_rsk(req);
689 ireq->loc_addr = daddr; 686 ireq->loc_addr = skb->nh.iph->daddr;
690 ireq->rmt_addr = saddr; 687 ireq->rmt_addr = skb->nh.iph->saddr;
691 req->rcv_wnd = dccp_feat_default_sequence_window; 688 req->rcv_wnd = dccp_feat_default_sequence_window;
692 ireq->opt = NULL; 689 ireq->opt = NULL;
693 690