Commit 2f84a2e6 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Johan Hedberg
Browse files

Bluetooth: Remove extra l2cap_state_change(BT_CONNECTED) 



This is already performed inside l2cap_chan_ready(), so we don't need it
here again.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Acked-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 35d401df

net/bluetooth/l2cap_core.c

+0 −3
Original line number Diff line number Diff line
@@ -3651,8 +3651,6 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
	if (test_bit(CONF_INPUT_DONE, &chan->conf_state)) {

		set_default_fcs(chan);



		l2cap_state_change(chan, BT_CONNECTED);



		if (chan->mode == L2CAP_MODE_ERTM ||

		    chan->mode == L2CAP_MODE_STREAMING)

			err = l2cap_ertm_init(chan);
@@ -3783,7 +3781,6 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
	if (test_bit(CONF_OUTPUT_DONE, &chan->conf_state)) {

		set_default_fcs(chan);



		l2cap_state_change(chan, BT_CONNECTED);

		if (chan->mode == L2CAP_MODE_ERTM ||

		    chan->mode == L2CAP_MODE_STREAMING)

			err = l2cap_ertm_init(chan);

CRA Git | Maintained and supported by SUSTech CRA and CCSE