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

Commit b4c612a4 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

[Bluetooth] Return EINPROGRESS for non-blocking socket calls 



In case of non-blocking socket calls we should return EINPROGRESS
and not EAGAIN.

Signed-off-by: default avatarUlisses Furquim <ulissesf@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 7785162c

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo) 
		set_current_state(TASK_INTERRUPTIBLE);



		if (!timeo) {

			err = -EAGAIN;

			err = -EINPROGRESS;

			break;

		}

net/bluetooth/rfcomm/core.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, bdaddr_t *dst 
	addr.l2_family = AF_BLUETOOTH;

	addr.l2_psm    = htobs(RFCOMM_PSM);

	*err = sock->ops->connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);

	if (*err == 0 || *err == -EAGAIN)

	if (*err == 0 || *err == -EINPROGRESS)

		return s;



	rfcomm_session_del(s);