From: John Heffner <jheffner@psc.edu>
Date: Fri, 10 Feb 2006 01:06:57 +0000 (-0800)
Subject: [TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled
X-Git-Tag: v2.6.16-rc3~44^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6fcf9412de64056238a6295f21db7aa9c37a532e;p=~shefty%2Frdma-dev.git

[TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled

The rcvbuf lock should probably be honored here.

Signed-off-by: John Heffner <jheffner@psc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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