Commit 1089b67d authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Clear pending connections from hci_conn_params_clear 



When hci_conn_params_clear is called, it is always followed by a
call to hci_pend_le_conns_clear. So instead of making this explicit
just make sure it is always called. This makes this function similar
on how hci_conn_params_add and hci_conn_params_del work.

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

net/bluetooth/hci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -959,7 +959,6 @@ static ssize_t le_auto_conn_write(struct file *file, const char __user *data, 
	} else if (memcmp(buf, "clr", 3) == 0) {

		hci_dev_lock(hdev);

		hci_conn_params_clear(hdev);

		hci_pend_le_conns_clear(hdev);

		hci_update_background_scan(hdev);

		hci_dev_unlock(hdev);

	} else {
@@ -3561,6 +3560,8 @@ void hci_conn_params_clear(struct hci_dev *hdev) 
		kfree(params);

	}



	hci_pend_le_conns_clear(hdev);



	BT_DBG("All LE connection parameters were removed");

}
@@ -4006,7 +4007,6 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	hci_remote_oob_data_clear(hdev);

	hci_white_list_clear(hdev);

	hci_conn_params_clear(hdev);

	hci_pend_le_conns_clear(hdev);

	hci_dev_unlock(hdev);



	hci_dev_put(hdev);