From e78787b6dc1ab94eb9790ce46affa428bc6ee70c Mon Sep 17 00:00:00 2001
From: John Heffner <jheffner@psc.edu>
Date: Thu, 9 Feb 2006 17:06:57 -0800
Subject: [PATCH] --- yaml --- r: 20177 b: refs/heads/master c:
 6fcf9412de64056238a6295f21db7aa9c37a532e h: refs/heads/master i:   20175:
 d7322b754a5bc1ba578d9db41c534cc5b2a2f1d9 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a897642a52c1..0add38978d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80ba250e59ced808a8c9b79560938bbe4509c0a7
+refs/heads/master: 6fcf9412de64056238a6295f21db7aa9c37a532e
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index a97ed5416c28..e9a54ae7d690 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/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