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

Commit 29d8a590 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Factor out Create Configuration Response 



Use function to factor out similar code. For BR/EDR send EFS
Configuration Response immediately, for HS response will be sent
after receiving HCI Logical Link Complete event in the following
patches.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent ee22be7e

net/bluetooth/l2cap_core.c

+19 −13
Original line number Diff line number Diff line
@@ -3582,6 +3582,22 @@ static inline void set_default_fcs(struct l2cap_chan *chan) 
		chan->fcs = L2CAP_FCS_CRC16;

}



static void l2cap_send_efs_conf_rsp(struct l2cap_chan *chan, void *data,

				    u8 ident, u16 flags)

{

	struct l2cap_conn *conn = chan->conn;



	BT_DBG("conn %p chan %p ident %d flags 0x%4.4x", conn, chan, ident,

	       flags);



	clear_bit(CONF_LOC_CONF_PEND, &chan->conf_state);

	set_bit(CONF_OUTPUT_DONE, &chan->conf_state);



	l2cap_send_cmd(conn, ident, L2CAP_CONF_RSP,

		       l2cap_build_conf_rsp(chan, data,

					    L2CAP_CONF_SUCCESS, flags), data);

}



static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data)

{

	struct l2cap_conf_req *req = (struct l2cap_conf_req *) data;
@@ -3677,12 +3693,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 


		/* check compatibility */



		clear_bit(CONF_LOC_CONF_PEND, &chan->conf_state);

		set_bit(CONF_OUTPUT_DONE, &chan->conf_state);



		l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,

					l2cap_build_conf_rsp(chan, rsp,

					L2CAP_CONF_SUCCESS, flags), rsp);

		l2cap_send_efs_conf_rsp(chan, rsp, cmd->ident, flags);

	}



unlock:
@@ -3730,12 +3741,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 


			/* check compatibility */



			clear_bit(CONF_LOC_CONF_PEND, &chan->conf_state);

			set_bit(CONF_OUTPUT_DONE, &chan->conf_state);



			l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,

						l2cap_build_conf_rsp(chan, buf,

						L2CAP_CONF_SUCCESS, 0x0000), buf);

			l2cap_send_efs_conf_rsp(chan, buf, cmd->ident, 0);

		}

		goto done;