diff options
| author | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-03-20 12:30:36 -0500 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-03-20 12:30:36 -0500 |
| commit | 0f76ee451484d02c7405d92e7bceb39b415abb01 (patch) | |
| tree | 9722f84281f786ba48971dde057f5171a49969e4 /net/ipv4/tcp_input.c | |
| parent | 01d206a7c1167639f6ca6dac22140fbdca017558 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index a97ed5416c28..e9a54ae7d690 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -456,7 +456,8 @@ void tcp_rcv_space_adjust(struct sock *sk) | |||
| 456 | 456 | ||
| 457 | tp->rcvq_space.space = space; | 457 | tp->rcvq_space.space = space; |
| 458 | 458 | ||
| 459 | if (sysctl_tcp_moderate_rcvbuf) { | 459 | if (sysctl_tcp_moderate_rcvbuf && |
| 460 | !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { | ||
| 460 | int new_clamp = space; | 461 | int new_clamp = space; |
| 461 | 462 | ||
| 462 | /* Receive space grows, normalize in order to | 463 | /* Receive space grows, normalize in order to |