From: Johan Hedberg Date: Sun, 8 Jan 2012 21:39:40 +0000 (+0200) Subject: Bluetooth: Fix resetting HCI_MGMT flag X-Git-Tag: v3.4-rc1~177^2~112^2~235 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=44b5f7d0cb1939497a0858d9f43d89f039f85887;p=karo-tx-linux.git Bluetooth: Fix resetting HCI_MGMT flag The HCI_MGMT flag should not be cleared when resetting a HCI device. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann --- 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)