---

yaml --- r: 210139 b: refs/heads/master c: d84ba63 h: refs/heads/master i: 210137: 63c7847 210135: 03c7526 v: v3
git-mirror · Aug 26, 2010 · 0e7ed40 · 0e7ed40
1 parent 6a44814
commit 0e7ed40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;