mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 19:07:52 +00:00
Code Issues Releases Wiki Activity

[IrDA] af_irda: irda_accept cleanup

Browse source 
This patch removes a cut'n'paste copy of wait_event_interruptible
from irda_accept.

Signed-off-by: Samuel Ortiz <samuel@ortiz.org>
Acked-by: Olaf Kirch <olaf.kirch@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Samuel Ortiz 2007-04-20 22:09:33 -07:00 committed by David S. Miller
parent 6e66aa15d8
commit d7f48d1a93
1 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net/irda/af_irda.c
View file

@ -872,37 +872,19 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
* calling us, the data is waiting for us ;-) * calling us, the data is waiting for us ;-)
* Jean II * Jean II
*/ */
while (1) {
skb = skb_dequeue(&sk->sk_receive_queue); skb = skb_dequeue(&sk->sk_receive_queue);
if (skb == NULL) { if (skb)
int ret = 0; break;
DECLARE_WAITQUEUE(waitq, current);
/* Non blocking operation */ /* Non blocking operation */
if (flags & O_NONBLOCK) if (flags & O_NONBLOCK)
return -EWOULDBLOCK; return -EWOULDBLOCK;
/* The following code is a cut'n'paste of the err = wait_event_interruptible(*(sk->sk_sleep),
* wait_event_interruptible() macro. skb_peek(&sk->sk_receive_queue));
* We don't us the macro because the condition has if (err)
* side effects : we want to make sure that only one return err;
* skb get dequeued - Jean II */
add_wait_queue(sk->sk_sleep, &waitq);
for (;;) {
set_current_state(TASK_INTERRUPTIBLE);
skb = skb_dequeue(&sk->sk_receive_queue);
if (skb != NULL)
break;
if (!signal_pending(current)) {
schedule();
continue;
}
ret = -ERESTARTSYS;
break;
}
current->state = TASK_RUNNING;
remove_wait_queue(sk->sk_sleep, &waitq);
if(ret)
return -ERESTARTSYS;
} }
newsk = newsock->sk; newsk = newsock->sk;