diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-01-18 09:14:43 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 10:01:27 -0500 |
commit | 7005ff1780ca7ad5ed2ec710ad35affc48362ebf (patch) | |
tree | 91d78d3165c2b802daf1fc302e33518f99abad77 | |
parent | 3c9e919511f87f10491628c6b44bc4675822f307 (diff) |
Bluetooth: Fix clearing persistent flags
There are several other dev_flags besided HCI_MGMT that should not be
cleared upon reset.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 42d63522270f..54132a909ea5 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -195,8 +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 | /* Reset all flags, except persistent ones like HCI_MGMT */ | 198 | /* Reset all flags, except persistent ones */ |
199 | hdev->dev_flags &= BIT(HCI_MGMT); | 199 | hdev->dev_flags &= BIT(HCI_MGMT) | BIT(HCI_SETUP) | BIT(HCI_AUTO_OFF); |
200 | } | 200 | } |
201 | 201 | ||
202 | static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) | 202 | static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) |