aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/minisocks.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/minisocks.c')
-rw-r--r--net/dccp/minisocks.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 831b76e08d02..b1d5da61f6af 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -200,10 +200,10 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,
200 struct request_sock **prev) 200 struct request_sock **prev)
201{ 201{
202 struct sock *child = NULL; 202 struct sock *child = NULL;
203 struct dccp_request_sock *dreq = dccp_rsk(req);
203 204
204 /* Check for retransmitted REQUEST */ 205 /* Check for retransmitted REQUEST */
205 if (dccp_hdr(skb)->dccph_type == DCCP_PKT_REQUEST) { 206 if (dccp_hdr(skb)->dccph_type == DCCP_PKT_REQUEST) {
206 struct dccp_request_sock *dreq = dccp_rsk(req);
207 207
208 if (after48(DCCP_SKB_CB(skb)->dccpd_seq, dreq->dreq_isr)) { 208 if (after48(DCCP_SKB_CB(skb)->dccpd_seq, dreq->dreq_isr)) {
209 dccp_pr_debug("Retransmitted REQUEST\n"); 209 dccp_pr_debug("Retransmitted REQUEST\n");
@@ -227,22 +227,22 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,
227 goto drop; 227 goto drop;
228 228
229 /* Invalid ACK */ 229 /* Invalid ACK */
230 if (DCCP_SKB_CB(skb)->dccpd_ack_seq != dccp_rsk(req)->dreq_iss) { 230 if (DCCP_SKB_CB(skb)->dccpd_ack_seq != dreq->dreq_iss) {
231 dccp_pr_debug("Invalid ACK number: ack_seq=%llu, " 231 dccp_pr_debug("Invalid ACK number: ack_seq=%llu, "
232 "dreq_iss=%llu\n", 232 "dreq_iss=%llu\n",
233 (unsigned long long) 233 (unsigned long long)
234 DCCP_SKB_CB(skb)->dccpd_ack_seq, 234 DCCP_SKB_CB(skb)->dccpd_ack_seq,
235 (unsigned long long) 235 (unsigned long long) dreq->dreq_iss);
236 dccp_rsk(req)->dreq_iss);
237 goto drop; 236 goto drop;
238 } 237 }
239 238
239 if (dccp_parse_options(sk, dreq, skb))
240 goto drop;
241
240 child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL); 242 child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL);
241 if (child == NULL) 243 if (child == NULL)
242 goto listen_overflow; 244 goto listen_overflow;
243 245
244 /* FIXME: deal with options */
245
246 inet_csk_reqsk_queue_unlink(sk, req, prev); 246 inet_csk_reqsk_queue_unlink(sk, req, prev);
247 inet_csk_reqsk_queue_removed(sk, req); 247 inet_csk_reqsk_queue_removed(sk, req);
248 inet_csk_reqsk_queue_add(sk, req, child); 248 inet_csk_reqsk_queue_add(sk, req, child);