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

Commit 276d8073 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Remove unused l2cap_conn->security_timer 



Now that there are no-longer any users for l2cap_conn->security_timer we
can go ahead and simply remove it. The patch makes initialization of the
conn->info_timer unconditional since it's better not to leave any
l2cap_conn data structures uninitialized no matter what the underlying
transport.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b68fda68

include/net/bluetooth/l2cap.h

+0 −1
Original line number Diff line number Diff line
@@ -638,7 +638,6 @@ struct l2cap_conn { 


	__u8			disc_reason;



	struct delayed_work	security_timer;

	struct l2cap_chan	*smp;



	struct list_head	chan_l;

net/bluetooth/l2cap_core.c

+1 −17
Original line number Diff line number Diff line
@@ -1659,19 +1659,6 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) 
	l2cap_conn_put(conn);

}



static void security_timeout(struct work_struct *work)

{

	struct l2cap_conn *conn = container_of(work, struct l2cap_conn,

					       security_timer.work);



	BT_DBG("conn %p", conn);



	if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) {

		smp_chan_destroy(conn);

		l2cap_conn_del(conn->hcon, ETIMEDOUT);

	}

}



static void disconn_work(struct work_struct *work)

{

	struct l2cap_conn *conn = container_of(work, struct l2cap_conn,
@@ -6948,9 +6935,6 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon) 
	INIT_LIST_HEAD(&conn->chan_l);

	INIT_LIST_HEAD(&conn->users);



	if (hcon->type == LE_LINK)

		INIT_DELAYED_WORK(&conn->security_timer, security_timeout);

	else

	INIT_DELAYED_WORK(&conn->info_timer, l2cap_info_timeout);



	INIT_WORK(&conn->disconn_work, disconn_work);