From db1101b24ccc053fa4de5bdfe9b103235d50afab Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 10 Jan 2008 21:56:38 -0800
Subject: [PATCH] --- yaml --- r: 78760 b: refs/heads/master c:
 9993e7d313e80bdc005d09c7def91903e0068f07 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/net/sock.h   | 8 ++++++++
 trunk/net/ipv4/tcp_timer.c | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea33eeb05859..a785fc86f9da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e186932b3d26bd975022a1e254407e95dddceae7
+refs/heads/master: 9993e7d313e80bdc005d09c7def91903e0068f07
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 786fae858e77..902324488d0f 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -759,6 +759,14 @@ static inline void sk_mem_reclaim(struct sock *sk)
 		__sk_mem_reclaim(sk);
 }
 
+static inline void sk_mem_reclaim_partial(struct sock *sk)
+{
+	if (!sk_has_account(sk))
+		return;
+	if (sk->sk_forward_alloc > SK_MEM_QUANTUM)
+		__sk_mem_reclaim(sk);
+}
+
 static inline void sk_mem_charge(struct sock *sk, int size)
 {
 	if (!sk_has_account(sk))
diff --git a/trunk/net/ipv4/tcp_timer.c b/trunk/net/ipv4/tcp_timer.c
index 17931be6d584..803d758a2b12 100644
--- a/trunk/net/ipv4/tcp_timer.c
+++ b/trunk/net/ipv4/tcp_timer.c
@@ -186,7 +186,7 @@ static void tcp_delack_timer(unsigned long data)
 		goto out_unlock;
 	}
 
-	sk_mem_reclaim(sk);
+	sk_mem_reclaim_partial(sk);
 
 	if (sk->sk_state == TCP_CLOSE || !(icsk->icsk_ack.pending & ICSK_ACK_TIMER))
 		goto out;