From 0e7ed404486b8d11b68cca6ad509761b9b2ebc80 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Tue, 24 Aug 2010 16:05:48 +0000
Subject: [PATCH] --- yaml --- r: 210139 b: refs/heads/master c:
 d84ba638e4ba3c40023ff997aa5e8d3ed002af36 h: refs/heads/master i:   210137:
 63c7847e0bdf339b32979fbfc76d71aa552c866d   210135:
 03c75265edf8fe5efd48d73a93d56741f0c5b1a8 v: v3

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

diff --git a/[refs] b/[refs]
index 6636bd91b7b5..430495232fe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5ed63d66f24fd4f7089b5a6e087b0ce7202aa8e
+refs/heads/master: d84ba638e4ba3c40023ff997aa5e8d3ed002af36
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index e2add5ff9cb1..3fb1428e526e 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -451,7 +451,8 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
 				if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk))
 					mask |= POLLOUT | POLLWRNORM;
 			}
-		}
+		} else
+			mask |= POLLOUT | POLLWRNORM;
 
 		if (tp->urg_data & TCP_URG_VALID)
 			mask |= POLLPRI;