diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /net/dccp/input.c | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'net/dccp/input.c')
| -rw-r--r-- | net/dccp/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index 08392ed86c25..df2f110df94a 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c | |||
| @@ -413,7 +413,7 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk, | |||
| 413 | 413 | ||
| 414 | /* Stop the REQUEST timer */ | 414 | /* Stop the REQUEST timer */ |
| 415 | inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); | 415 | inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS); |
| 416 | BUG_TRAP(sk->sk_send_head != NULL); | 416 | WARN_ON(sk->sk_send_head == NULL); |
| 417 | __kfree_skb(sk->sk_send_head); | 417 | __kfree_skb(sk->sk_send_head); |
| 418 | sk->sk_send_head = NULL; | 418 | sk->sk_send_head = NULL; |
| 419 | 419 | ||