From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Date: Wed, 16 Sep 2009 04:37:26 +0000 (+0000)
Subject: af_iucv: handle non-accepted sockets after resuming from suspend
X-Git-Tag: v2.6.32-rc1~657^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56a73de3889383b70ed1fef06aaab0677731b0ea;p=users%2Fjedix%2Flinux-maple.git

af_iucv: handle non-accepted sockets after resuming from suspend

After resuming from suspend, all af_iucv sockets are disconnected.
Ensure that iucv_accept_dequeue() can handle disconnected sockets
which are not yet accepted.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 21ee68be02ee..a48fd2871532 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -569,6 +569,7 @@ struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock)
 
 		if (sk->sk_state == IUCV_CONNECTED ||
 		    sk->sk_state == IUCV_SEVERED ||
+		    sk->sk_state == IUCV_DISCONN ||	/* due to PM restore */
 		    !newsock) {
 			iucv_accept_unlink(sk);
 			if (newsock)