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

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

Bluetooth: Remove unnecessary intermediate function 



Resolves a conflict resolution issue in "Bluetooth: Fix L2CAP coding
style".  The remaining connect and create channel response handler is
renamed to better reflect its use for both response types.

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

net/bluetooth/l2cap_core.c

+2 −11
Original line number Diff line number Diff line
@@ -3538,7 +3538,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn, 
	return 0;

}



static inline int l2cap_connect_rsp(struct l2cap_conn *conn,

static int l2cap_connect_create_rsp(struct l2cap_conn *conn,

				    struct l2cap_cmd_hdr *cmd, u8 *data)

{

	struct l2cap_conn_rsp *rsp = (struct l2cap_conn_rsp *) data;
@@ -4092,15 +4092,6 @@ static 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)

{
@@ -4307,7 +4298,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn, 


	case L2CAP_CONN_RSP:

	case L2CAP_CREATE_CHAN_RSP:

		err = l2cap_connect_rsp(conn, cmd, data);

		err = l2cap_connect_create_rsp(conn, cmd, data);

		break;



	case L2CAP_CONF_REQ: