aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-01-08 16:39:40 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:25 -0500
commit44b5f7d0cb1939497a0858d9f43d89f039f85887 (patch)
treebc3688da3f44871aa4c2c79de80752f64883672b /net/bluetooth/hci_event.c
parenta8b2d5c2cfe1c6398e3fdd4372c4ae7f74fb4493 (diff)
Bluetooth: Fix resetting HCI_MGMT flag
The HCI_MGMT flag should not be cleared when resetting a HCI device. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 2d39ede1f202..f3dafae6e1db 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -195,7 +195,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
195 195
196 hci_req_complete(hdev, HCI_OP_RESET, status); 196 hci_req_complete(hdev, HCI_OP_RESET, status);
197 197
198 hdev->dev_flags = 0; 198 /* Reset all flags, except persistent ones like HCI_MGMT */
199 hdev->dev_flags &= BIT(HCI_MGMT);
199} 200}
200 201
201static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) 202static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)