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

Commit f5a2598d authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

Bluetooth: Process create response and connect response identically 



Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 716e4ab5

net/bluetooth/l2cap_core.c

+1 −12
Original line number Diff line number Diff line
@@ -4033,14 +4033,6 @@ static inline int l2cap_create_channel_req(struct l2cap_conn *conn, 
	return 0;

}



static inline int l2cap_create_channel_rsp(struct l2cap_conn *conn,

					struct l2cap_cmd_hdr *cmd, void *data)

{

	BT_DBG("conn %p", conn);



	return l2cap_connect_rsp(conn, cmd, data);

}



static void l2cap_send_move_chan_rsp(struct l2cap_conn *conn, u8 ident,

				     u16 icid, u16 result)

{
@@ -4244,6 +4236,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn, 
		break;



	case L2CAP_CONN_RSP:

	case L2CAP_CREATE_CHAN_RSP:

		err = l2cap_connect_rsp(conn, cmd, data);

		break;
@@ -4282,10 +4275,6 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn, 
		err = l2cap_create_channel_req(conn, cmd, cmd_len, data);

		break;



	case L2CAP_CREATE_CHAN_RSP:

		err = l2cap_create_channel_rsp(conn, cmd, data);

		break;



	case L2CAP_MOVE_CHAN_REQ:

		err = l2cap_move_channel_req(conn, cmd, cmd_len, data);

		break;