Commit 2ba13ed6 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Remove check for supported mode 



Since now we have checks for the supported mode before on
l2cap_info_rsp we can remove the check for it here.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 6c2ea7a8

net/bluetooth/l2cap.c

+2 −7
Original line number Diff line number Diff line
@@ -2473,15 +2473,10 @@ static int l2cap_build_conf_req(struct sock *sk, void *data) 
	switch (pi->mode) {

	case L2CAP_MODE_STREAMING:

	case L2CAP_MODE_ERTM:

		if (!(pi->conf_state & L2CAP_CONF_STATE2_DEVICE)) {

			pi->mode = l2cap_select_mode(rfc.mode,

					pi->conn->feat_mask);

		if (pi->conf_state & L2CAP_CONF_STATE2_DEVICE)

			break;

		}



		if (!l2cap_mode_supported(pi->mode, pi->conn->feat_mask))

			l2cap_send_disconn_req(pi->conn, sk, ECONNRESET);

		break;

		/* fall through */

	default:

		pi->mode = l2cap_select_mode(rfc.mode, pi->conn->feat_mask);

		break;