diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 18:02:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 18:02:04 -0500 |
| commit | 1cb9d721d9df9182a42d1ff59427a100c6522efc (patch) | |
| tree | 3c7d47828f89853de49e979f97ffe78fd1dba7d6 /net/ipv4/tcp_input.c | |
| parent | ca7d5e42d783e54f0057317c9226262d68ab7717 (diff) | |
| parent | bef4a456b8dc8b3638f4d49a25a89e1467da9483 (diff) | |
Merge branch 'upstream'
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 a97ed5416c2..e9a54ae7d69 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) tp->rcvq_space.space = space; - if (sysctl_tcp_moderate_rcvbuf) { + if (sysctl_tcp_moderate_rcvbuf && + !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { int new_clamp = space; /* Receive space grows, normalize in order to |