Эх сурвалжийг харах

Bluetooth: Add new quirk for non-persistent setup settings

Add a new quirk HCI_QUIRK_NON_PERSISTENT_SETUP allowing that a quirk that
runs setup() after every open() and not just after the first open().

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Sean Wang 7 жил өмнө
parent
commit
740011cfe9

+ 9 - 0
include/net/bluetooth/hci.h

@@ -183,6 +183,15 @@ enum {
 	 * during the hdev->setup vendor callback.
 	 * during the hdev->setup vendor callback.
 	 */
 	 */
 	HCI_QUIRK_NON_PERSISTENT_DIAG,
 	HCI_QUIRK_NON_PERSISTENT_DIAG,
+
+	/* When this quirk is set, setup() would be run after every
+	 * open() and not just after the first open().
+	 *
+	 * This quirk can be set before hci_register_dev is called or
+	 * during the hdev->setup vendor callback.
+	 *
+	 */
+	HCI_QUIRK_NON_PERSISTENT_SETUP,
 };
 };
 
 
 /* HCI device flags */
 /* HCI device flags */

+ 2 - 1
net/bluetooth/hci_core.c

@@ -1415,7 +1415,8 @@ static int hci_dev_do_open(struct hci_dev *hdev)
 	atomic_set(&hdev->cmd_cnt, 1);
 	atomic_set(&hdev->cmd_cnt, 1);
 	set_bit(HCI_INIT, &hdev->flags);
 	set_bit(HCI_INIT, &hdev->flags);
 
 
-	if (hci_dev_test_flag(hdev, HCI_SETUP)) {
+	if (hci_dev_test_flag(hdev, HCI_SETUP) ||
+	    test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
 		hci_sock_dev_event(hdev, HCI_DEV_SETUP);
 		hci_sock_dev_event(hdev, HCI_DEV_SETUP);
 
 
 		if (hdev->setup)
 		if (hdev->setup)