---

yaml --- r: 290869 b: refs/heads/master c: 44b5f7d h: refs/heads/master i: 290867: 72eb26d v: v3
git-mirror · Feb 13, 2012 · b30f31c · b30f31c
1 parent 145b0f2
commit b30f31c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8b2d5c2cfe1c6398e3fdd4372c4ae7f74fb4493
+refs/heads/master: 44b5f7d0cb1939497a0858d9f43d89f039f85887
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -195,7 +195,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
 
 	hci_req_complete(hdev, HCI_OP_RESET, status);
 
-	hdev->dev_flags = 0;
+	/* Reset all flags, except persistent ones like HCI_MGMT */
+	hdev->dev_flags &= BIT(HCI_MGMT);
 }
 
 static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)