diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2012-01-08 23:39:40 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:25 +0200 |
| commit | 44b5f7d0cb1939497a0858d9f43d89f039f85887 (patch) | |
| tree | bc3688da3f44871aa4c2c79de80752f64883672b | |
| parent | Bluetooth: Move mgmt related flags from hdev->flags to hdev->dev_flags (diff) | |
| download | linux-dev-44b5f7d0cb1939497a0858d9f43d89f039f85887.tar.xz linux-dev-44b5f7d0cb1939497a0858d9f43d89f039f85887.zip | |
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>
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 |
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) 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) |