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

Commit 2cc6fb00 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Add a define for the HCI persistent flags mask 



We'll need to use this mask also when powering off the HCI device
so it's better to have this in a single and visible place.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 2908fe31

include/net/bluetooth/hci.h

+5 −0
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ enum { 
	HCI_PERIODIC_INQ,

};



/* A mask for the flags that are supposed to remain when a reset happens

 * or the HCI device is closed.

 */

#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ))



/* HCI ioctl defines */

#define HCIDEVUP	_IOW('H', 201, int)

#define HCIDEVDOWN	_IOW('H', 202, int)

net/bluetooth/hci_event.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
	clear_bit(HCI_RESET, &hdev->flags);



	/* Reset all non-persistent flags */

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

	hdev->dev_flags &= ~HCI_PERSISTENT_MASK;



	hdev->discovery.state = DISCOVERY_STOPPED;

	hdev->inq_tx_power = HCI_TX_POWER_INVALID;