From b30f31c6177029f039972e54087742da373c5220 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sun, 8 Jan 2012 23:39:40 +0200 Subject: [PATCH] --- yaml --- r: 290869 b: refs/heads/master c: 44b5f7d0cb1939497a0858d9f43d89f039f85887 h: refs/heads/master i: 290867: 72eb26d933c1be98bb531ae8e3cd14707b2947fb v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5f537f620245..6bef2f361bf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8b2d5c2cfe1c6398e3fdd4372c4ae7f74fb4493 +refs/heads/master: 44b5f7d0cb1939497a0858d9f43d89f039f85887 diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 2d39ede1f202..f3dafae6e1db 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/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)