From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 12 Mar 2007 22:52:52 +0000 (-0700)
Subject: [ROSE]: Remove ourselves from waitqueue when receiving a signal
X-Git-Tag: v2.6.21-rc4~43^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6cee77dbf29e3c4c2cf2ce16621759accc76891e;p=linux-2.6-omap-h63xx.git

[ROSE]: Remove ourselves from waitqueue when receiving a signal

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 8c34f1ca6c8..596b302d0e4 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -877,6 +877,8 @@ static int rose_accept(struct socket *sock, struct socket *newsock, int flags)
 			lock_sock(sk);
 			continue;
 		}
+		current->state = TASK_RUNNING;
+		remove_wait_queue(sk->sk_sleep, &wait);
 		return -ERESTARTSYS;
 	}
 	current->state = TASK_RUNNING;