Commit 0797e01d authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Johan Hedberg
Browse files

Bluetooth: Use chan->state instead of sk->sk_state 



These vars are kept in sync so we can use chan->state here.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 54a59aa2

net/bluetooth/l2cap_core.c

+2 −7
Original line number Diff line number Diff line
@@ -1442,21 +1442,17 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
		goto done;

	}



	lock_sock(sk);



	switch (sk->sk_state) {

	switch (chan->state) {

	case BT_CONNECT:

	case BT_CONNECT2:

	case BT_CONFIG:

		/* Already connecting */

		err = 0;

		release_sock(sk);

		goto done;



	case BT_CONNECTED:

		/* Already connected */

		err = -EISCONN;

		release_sock(sk);

		goto done;



	case BT_OPEN:
@@ -1466,13 +1462,12 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 


	default:

		err = -EBADFD;

		release_sock(sk);

		goto done;

	}



	/* Set destination address and psm */

	lock_sock(sk);

	bacpy(&bt_sk(sk)->dst, dst);



	release_sock(sk);



	chan->psm = psm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE