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

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

Bluetooth: Remove unneeded timer clear 



set_chan_timer clears timer itself

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo@padovan.org>
parent 00e3112c

net/bluetooth/l2cap_core.c

+0 −3
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason) 
	case BT_CONFIG:

		if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED &&

					conn->hcon->type == ACL_LINK) {

			__clear_chan_timer(chan);

			__set_chan_timer(chan, sk->sk_sndtimeo);

			l2cap_send_disconn_req(conn, chan, reason);

		} else
@@ -4542,7 +4541,6 @@ static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt) 


	if (encrypt == 0x00) {

		if (chan->sec_level == BT_SECURITY_MEDIUM) {

			__clear_chan_timer(chan);

			__set_chan_timer(chan, L2CAP_ENC_TIMEOUT);

		} else if (chan->sec_level == BT_SECURITY_HIGH)

			l2cap_chan_close(chan, ECONNREFUSED);
@@ -4600,7 +4598,6 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 
			if (!status) {

				l2cap_send_conn_req(chan);

			} else {

				__clear_chan_timer(chan);

				__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

			}

		} else if (chan->state == BT_CONNECT2) {