diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /net/ipv4/tcp_timer.c | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 328e0cf42b3c..5ab6ba19c3ce 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
| @@ -287,7 +287,7 @@ static void tcp_retransmit_timer(struct sock *sk) | |||
| 287 | if (!tp->packets_out) | 287 | if (!tp->packets_out) |
| 288 | goto out; | 288 | goto out; |
| 289 | 289 | ||
| 290 | BUG_TRAP(!tcp_write_queue_empty(sk)); | 290 | WARN_ON(tcp_write_queue_empty(sk)); |
| 291 | 291 | ||
| 292 | if (!tp->snd_wnd && !sock_flag(sk, SOCK_DEAD) && | 292 | if (!tp->snd_wnd && !sock_flag(sk, SOCK_DEAD) && |
| 293 | !((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))) { | 293 | !((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))) { |