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

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

Bluetooth: Disable auto-connection parameters when unpairing 



For connection parameters that are left around until a disconnection
we should at least clear any auto-connection properties. This way a
new Add Device call is required to re-set them after calling Unpair
Device.

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

net/bluetooth/mgmt.c

+10 −0
Original line number Diff line number Diff line
@@ -3052,6 +3052,7 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
{

	struct mgmt_cp_unpair_device *cp = data;

	struct mgmt_rp_unpair_device rp;

	struct hci_conn_params *params;

	struct hci_cp_disconnect dc;

	struct mgmt_pending_cmd *cmd;

	struct hci_conn *conn;
@@ -3131,6 +3132,15 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	 */

	set_bit(HCI_CONN_PARAM_REMOVAL_PEND, &conn->flags);



	/* Disable auto-connection parameters if present */

	params = hci_conn_params_lookup(hdev, &cp->addr.bdaddr, addr_type);

	if (params) {

		if (params->explicit_connect)

			params->auto_connect = HCI_AUTO_CONN_EXPLICIT;

		else

			params->auto_connect = HCI_AUTO_CONN_DISABLED;

	}



	/* If disconnection is not requested, then clear the connection

	 * variable so that the link is not terminated.

	 */