---

yaml --- r: 291011 b: refs/heads/master c: a297e97 h: refs/heads/master i: 291009: 5efd7f5 291007: b070bd7 v: v3
git-mirror · Feb 21, 2012 · 43d421f · 43d421f
1 parent b624cf9
commit 43d421f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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)