diff options
Diffstat (limited to 'net/dccp/input.c')
| -rw-r--r-- | net/dccp/input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index df2f110df94a..803933ab396d 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
| @@ -411,12 +411,6 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk, | |||
| 411 | struct dccp_sock *dp = dccp_sk(sk); | 411 | struct dccp_sock *dp = dccp_sk(sk); |
| 412 | long tstamp = dccp_timestamp(); | 412 | long tstamp = dccp_timestamp(); |
| 413 | 413 | ||
| 414 | /* Stop the REQUEST timer */ | ||
| 415 | inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); | ||
| 416 | WARN_ON(sk->sk_send_head == NULL); | ||
| 417 | __kfree_skb(sk->sk_send_head); | ||
| 418 | sk->sk_send_head = NULL; | ||
| 419 | |||
| 420 | if (!between48(DCCP_SKB_CB(skb)->dccpd_ack_seq, | 414 | if (!between48(DCCP_SKB_CB(skb)->dccpd_ack_seq, |
| 421 | dp->dccps_awl, dp->dccps_awh)) { | 415 | dp->dccps_awl, dp->dccps_awh)) { |
| 422 | dccp_pr_debug("invalid ackno: S.AWL=%llu, " | 416 | dccp_pr_debug("invalid ackno: S.AWL=%llu, " |
| @@ -441,6 +435,12 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk, | |||
| 441 | DCCP_ACKVEC_STATE_RECEIVED)) | 435 | DCCP_ACKVEC_STATE_RECEIVED)) |
| 442 | goto out_invalid_packet; /* FIXME: change error code */ | 436 | goto out_invalid_packet; /* FIXME: change error code */ |
| 443 | 437 | ||
| 438 | /* Stop the REQUEST timer */ | ||
| 439 | inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); | ||
| 440 | WARN_ON(sk->sk_send_head == NULL); | ||
| 441 | kfree_skb(sk->sk_send_head); | ||
| 442 | sk->sk_send_head = NULL; | ||
| 443 | |||
| 444 | dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq; | 444 | dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq; |
| 445 | dccp_update_gsr(sk, dp->dccps_isr); | 445 | dccp_update_gsr(sk, dp->dccps_isr); |
| 446 | /* | 446 | /* |
