From 3130d27f7c1d39310e8db776b82c8afe19f7e6c9 Mon Sep 17 00:00:00 2001
From: Ian McDonald <ian.mcdonald@jandi.co.nz>
Date: Wed, 12 Jul 2006 17:58:53 -0700
Subject: [PATCH] --- yaml --- r: 32516 b: refs/heads/master c:
 a6f157a88d1398d7ccb743c5a56138edf6f6ef0b h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/net/core/stream.c | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 065217b57b3a..e4357342d89f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd1278d720b48ad7576f64014b916cc77365cb3f
+refs/heads/master: a6f157a88d1398d7ccb743c5a56138edf6f6ef0b
diff --git a/trunk/net/core/stream.c b/trunk/net/core/stream.c
index e9489696f694..d1d7decf70b0 100644
--- a/trunk/net/core/stream.c
+++ b/trunk/net/core/stream.c
@@ -196,15 +196,13 @@ EXPORT_SYMBOL(sk_stream_error);
 
 void __sk_stream_mem_reclaim(struct sock *sk)
 {
-	if (sk->sk_forward_alloc >= SK_STREAM_MEM_QUANTUM) {
-		atomic_sub(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM,
-			   sk->sk_prot->memory_allocated);
-		sk->sk_forward_alloc &= SK_STREAM_MEM_QUANTUM - 1;
-		if (*sk->sk_prot->memory_pressure &&
-		    (atomic_read(sk->sk_prot->memory_allocated) <
-		     sk->sk_prot->sysctl_mem[0]))
-			*sk->sk_prot->memory_pressure = 0;
-	}
+	atomic_sub(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM,
+		   sk->sk_prot->memory_allocated);
+	sk->sk_forward_alloc &= SK_STREAM_MEM_QUANTUM - 1;
+	if (*sk->sk_prot->memory_pressure &&
+	    (atomic_read(sk->sk_prot->memory_allocated) <
+	     sk->sk_prot->sysctl_mem[0]))
+		*sk->sk_prot->memory_pressure = 0;
 }
 
 EXPORT_SYMBOL(__sk_stream_mem_reclaim);