diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-01-18 16:14:43 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:27 +0200 |
| commit | 7005ff1780ca7ad5ed2ec710ad35affc48362ebf (patch) | |
| tree | 91d78d3165c2b802daf1fc302e33518f99abad77 /net/bluetooth/hci_event.c | |
| parent | 3c9e919511f87f10491628c6b44bc4675822f307 (diff) | |
| download | op-kernel-dev-7005ff1780ca7ad5ed2ec710ad35affc48362ebf.zip op-kernel-dev-7005ff1780ca7ad5ed2ec710ad35affc48362ebf.tar.gz | |
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>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -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 42d6352..54132a9 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) hci_req_complete(hdev, HCI_OP_RESET, status); - /* Reset all flags, except persistent ones like HCI_MGMT */ - hdev->dev_flags &= BIT(HCI_MGMT); + /* Reset all flags, except persistent ones */ + hdev->dev_flags &= BIT(HCI_MGMT) | BIT(HCI_SETUP) | BIT(HCI_AUTO_OFF); } static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) |
