From 43d421fc4b713986f6b9ed58e3b12b036911c692 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 21 Feb 2012 17:55:47 +0200 Subject: [PATCH] --- yaml --- r: 291011 b: refs/heads/master c: a297e97cf7228467a8c5c76216945ccf029ae2a4 h: refs/heads/master i: 291009: 5efd7f549984392db3f86e00b5c56e8d5330154a 291007: b070bd77b985dabb701fd28e19750cb5d196ed93 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6bfe54ac8286..3dc8766cc177 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0224d2fafbbed4ac0cb05d08d3adab506a398451 +refs/heads/master: a297e97cf7228467a8c5c76216945ccf029ae2a4 diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 5d0f92a948c2..2a5d05c05e35 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -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)