aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-03-15 17:06:57 -0500
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-03-18 14:02:02 -0300
commit2cc6fb0049bc02ca7a020ba7b4f88b4c35976058 (patch)
tree7409818813401d2ec66ecbc73cb4b7b42f5c78f1 /net/bluetooth
parent2908fe31cf6b8d3a975efb567347f85e724f4e81 (diff)
downloadkernel_goldelico_gta04-2cc6fb0049bc02ca7a020ba7b4f88b4c35976058.zip
kernel_goldelico_gta04-2cc6fb0049bc02ca7a020ba7b4f88b4c35976058.tar.gz
kernel_goldelico_gta04-2cc6fb0049bc02ca7a020ba7b4f88b4c35976058.tar.bz2
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: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5f2d008..ed4ecd9 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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;