diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
| commit | cbefa3258eade263dbc9ae2c1f1ea2ca96e6b457 (patch) | |
| tree | 51f012ef93cc828be4eb693c0ced0503217d1025 /net/ipv4/tcp_input.c | |
| parent | 489ff4c7d167be954f715128790bd80d3c888322 (diff) | |
| parent | 25bf368b3d98668c5d5f38e2201d8bca16e52680 (diff) | |
Merge branch 'master'
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) 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 |