---

yaml --- r: 162920 b: refs/heads/master c: 56a73de h: refs/heads/master v: v3
git-mirror · Sep 17, 2009 · bfea46d · bfea46d
1 parent 8e272b4
commit bfea46d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9973179aef2af88b6fe4cc1df7ced6fe7cec7d0
+refs/heads/master: 56a73de3889383b70ed1fef06aaab0677731b0ea
diff --git a/trunk/net/iucv/af_iucv.c b/trunk/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)