Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7f48d1a authored by Samuel Ortiz's avatar Samuel Ortiz Committed by David S. Miller
Browse files

[IrDA] af_irda: irda_accept cleanup 



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

Signed-off-by: default avatarSamuel Ortiz <samuel@ortiz.org>
Acked-by: default avatarOlaf Kirch <olaf.kirch@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e66aa15

net/irda/af_irda.c

+8 −26
Original line number Diff line number Diff line
@@ -872,37 +872,19 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) 
	 * calling us, the data is waiting for us ;-)

	 * Jean II

	 */

	while (1) {

		skb = skb_dequeue(&sk->sk_receive_queue);

	if (skb == NULL) {

		int ret = 0;

		DECLARE_WAITQUEUE(waitq, current);

		if (skb)

			break;



		/* Non blocking operation */

		if (flags & O_NONBLOCK)

			return -EWOULDBLOCK;



		/* The following code is a cut'n'paste of the

		 * wait_event_interruptible() macro.

		 * We don't us the macro because the condition has

		 * side effects : we want to make sure that only one

		 * 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;

		err = wait_event_interruptible(*(sk->sk_sleep),

					skb_peek(&sk->sk_receive_queue));

		if (err)

			return err;

	}



	newsk = newsock->sk;