From 20700c0721133fcd9d3b58ea95e04172c059fd40 Mon Sep 17 00:00:00 2001
From: Tom Marshall <tdm.code@gmail.com>
Date: Mon, 20 Sep 2010 15:42:05 -0700
Subject: [PATCH] --- yaml --- r: 211087 b: refs/heads/master c:
 a4d258036ed9b2a1811c3670c6099203a0f284a0 h: refs/heads/master i:   211085:
 9a3a1bb687bafd44ed7a1d1bb48c63acc6ea22d8   211083:
 2215effb82360848051c4541049bd20e69234309   211079:
 7978142dc34b9e5d5d3081d16b1abbc5493fc8a2   211071:
 9e808b63a7137c6a887e94b6d18c83950c69b149 v: v3

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

diff --git a/[refs] b/[refs]
index 50e3ff17c568..5e858f8b7148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9828e6e6e3f19efcb476c567b9999891d051f52f
+refs/heads/master: a4d258036ed9b2a1811c3670c6099203a0f284a0
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 3fb1428e526e..95d75d443927 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -386,8 +386,6 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
 	 */
 
 	mask = 0;
-	if (sk->sk_err)
-		mask = POLLERR;
 
 	/*
 	 * POLLHUP is certainly not done right. But poll() doesn't
@@ -457,6 +455,11 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
 		if (tp->urg_data & TCP_URG_VALID)
 			mask |= POLLPRI;
 	}
+	/* This barrier is coupled with smp_wmb() in tcp_reset() */
+	smp_rmb();
+	if (sk->sk_err)
+		mask |= POLLERR;
+
 	return mask;
 }
 EXPORT_SYMBOL(tcp_poll);
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index e663b78a2ef6..149e79ac2891 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -4048,6 +4048,8 @@ static void tcp_reset(struct sock *sk)
 	default:
 		sk->sk_err = ECONNRESET;
 	}
+	/* This barrier is coupled with smp_rmb() in tcp_poll() */
+	smp_wmb();
 
 	if (!sock_flag(sk, SOCK_DEAD))
 		sk->sk_error_report(sk);