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

Commit a297e97c authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: Fix clearing of persistent dev_flags 



Now that most flags are persistent, only the LE_SCAN flag should be
cleared after a reset.

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

net/bluetooth/hci_event.c

+2 −3
Original line number Diff line number Diff line
@@ -192,9 +192,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 


	hci_req_complete(hdev, HCI_OP_RESET, status);



	/* Reset all flags, except persistent ones */

	hdev->dev_flags &= BIT(HCI_MGMT) | BIT(HCI_SETUP) | BIT(HCI_AUTO_OFF) |

				BIT(HCI_LINK_KEYS) | BIT(HCI_DEBUG_KEYS);

	/* Reset all non-persistent flags */

	hdev->dev_flags &= ~(BIT(HCI_LE_SCAN));

}



static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)