diff options
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ipv4.c | 5 | ||||
-rw-r--r-- | net/dccp/ipv6.c | 5 | ||||
-rw-r--r-- | net/dccp/minisocks.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 2423a0866733..efbcfdc12796 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -477,7 +477,8 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, | |||
477 | return &rt->u.dst; | 477 | return &rt->u.dst; |
478 | } | 478 | } |
479 | 479 | ||
480 | static int dccp_v4_send_response(struct sock *sk, struct request_sock *req) | 480 | static int dccp_v4_send_response(struct sock *sk, struct request_sock *req, |
481 | struct request_values *rv_unused) | ||
481 | { | 482 | { |
482 | int err = -1; | 483 | int err = -1; |
483 | struct sk_buff *skb; | 484 | struct sk_buff *skb; |
@@ -626,7 +627,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
626 | dreq->dreq_iss = dccp_v4_init_sequence(skb); | 627 | dreq->dreq_iss = dccp_v4_init_sequence(skb); |
627 | dreq->dreq_service = service; | 628 | dreq->dreq_service = service; |
628 | 629 | ||
629 | if (dccp_v4_send_response(sk, req)) | 630 | if (dccp_v4_send_response(sk, req, NULL)) |
630 | goto drop_and_free; | 631 | goto drop_and_free; |
631 | 632 | ||
632 | inet_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT); | 633 | inet_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT); |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 50ea91a77705..6574215a1f51 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -241,7 +241,8 @@ out: | |||
241 | } | 241 | } |
242 | 242 | ||
243 | 243 | ||
244 | static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) | 244 | static int dccp_v6_send_response(struct sock *sk, struct request_sock *req, |
245 | struct request_values *rv_unused) | ||
245 | { | 246 | { |
246 | struct inet6_request_sock *ireq6 = inet6_rsk(req); | 247 | struct inet6_request_sock *ireq6 = inet6_rsk(req); |
247 | struct ipv6_pinfo *np = inet6_sk(sk); | 248 | struct ipv6_pinfo *np = inet6_sk(sk); |
@@ -468,7 +469,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
468 | dreq->dreq_iss = dccp_v6_init_sequence(skb); | 469 | dreq->dreq_iss = dccp_v6_init_sequence(skb); |
469 | dreq->dreq_service = service; | 470 | dreq->dreq_service = service; |
470 | 471 | ||
471 | if (dccp_v6_send_response(sk, req)) | 472 | if (dccp_v6_send_response(sk, req, NULL)) |
472 | goto drop_and_free; | 473 | goto drop_and_free; |
473 | 474 | ||
474 | inet6_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT); | 475 | inet6_csk_reqsk_queue_hash_add(sk, req, DCCP_TIMEOUT_INIT); |
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 5ca49cec95f5..af226a063141 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c | |||
@@ -184,7 +184,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, | |||
184 | * counter (backoff, monitored by dccp_response_timer). | 184 | * counter (backoff, monitored by dccp_response_timer). |
185 | */ | 185 | */ |
186 | req->retrans++; | 186 | req->retrans++; |
187 | req->rsk_ops->rtx_syn_ack(sk, req); | 187 | req->rsk_ops->rtx_syn_ack(sk, req, NULL); |
188 | } | 188 | } |
189 | /* Network Duplicate, discard packet */ | 189 | /* Network Duplicate, discard packet */ |
190 | return NULL; | 190 | return NULL; |