diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-10 17:53:29 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 17:53:29 +0100 |
| commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
| tree | 9336a14058eed66c335db10512f33a31f9e8c938 /net/ipv4/tcp_input.c | |
| parent | [CIFS] fix compile error (typo) and warning in cifssmb.c (diff) | |
| parent | [PATCH] Updates for page migration (diff) | |
| download | linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.xz linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 |