diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /net/dccp/timer.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'net/dccp/timer.c')
| -rw-r--r-- | net/dccp/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 3608d5342ca2..6a5b961b6f5c 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
| @@ -106,7 +106,7 @@ static void dccp_retransmit_timer(struct sock *sk) | |||
| 106 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) | 106 | * -- Acks in client-PARTOPEN state (sec. 8.1.5) |
| 107 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) | 107 | * -- CloseReq in server-CLOSEREQ state (sec. 8.3) |
| 108 | * -- Close in node-CLOSING state (sec. 8.3) */ | 108 | * -- Close in node-CLOSING state (sec. 8.3) */ |
| 109 | BUG_TRAP(sk->sk_send_head != NULL); | 109 | WARN_ON(sk->sk_send_head == NULL); |
| 110 | 110 | ||
| 111 | /* | 111 | /* |
| 112 | * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was | 112 | * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was |