From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 9/9] Bluetooth: Fix clearing of persistent dev_flags
Date: Tue, 21 Feb 2012 18:00:05 +0200 [thread overview]
Message-ID: <1329840005-4977-9-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1329840005-4977-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
Now that most flags are persistent, only the LE_SCAN flag should be
cleared after a reset.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/hci_event.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5d0f92a..2a5d05c 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -192,9 +192,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 */
- hdev->dev_flags &= BIT(HCI_MGMT) | BIT(HCI_SETUP) | BIT(HCI_AUTO_OFF) |
- BIT(HCI_LINK_KEYS) | BIT(HCI_DEBUG_KEYS);
+ /* Reset all non-persistent flags */
+ hdev->dev_flags &= ~(BIT(HCI_LE_SCAN));
}
static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
--
1.7.9
next prev parent reply other threads:[~2012-02-21 16:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 15:59 [PATCH 1/9] Bluetooth: mgmt: Fix powered checks for commands johan.hedberg
2012-02-21 15:59 ` [PATCH 2/9] Bluetooth: mgmt: Fix set_local_name and set_dev_class powered checks johan.hedberg
2012-02-21 16:09 ` Marcel Holtmann
2012-02-21 15:59 ` [PATCH 3/9] Bluetooth: mgmt: Allow connectable/discoverable changes in off state johan.hedberg
2012-02-21 16:14 ` Marcel Holtmann
2012-02-21 16:00 ` [PATCH 4/9] Bluetooth: mgmt: Fix current settings values when powered off johan.hedberg
2012-02-21 16:15 ` Marcel Holtmann
2012-02-21 16:00 ` [PATCH 5/9] Bluetooth: mgmt: Add convenience function for sending New Settings johan.hedberg
2012-02-21 16:15 ` Marcel Holtmann
2012-02-21 16:00 ` [PATCH 6/9] Bluetooth: mgmt: Fix New Settings event for connectable/discoverable johan.hedberg
2012-02-21 16:21 ` Marcel Holtmann
2012-02-21 17:46 ` Johan Hedberg
2012-02-21 16:00 ` [PATCH 7/9] Bluetooth: mgmt: Fix set_fast_connectable error return johan.hedberg
2012-02-21 16:16 ` Marcel Holtmann
2012-02-21 16:00 ` [PATCH 8/9] Bluetooth: mgmt: Fix pairable setting upon initialization johan.hedberg
2012-02-21 16:17 ` Marcel Holtmann
2012-02-21 16:00 ` johan.hedberg [this message]
2012-02-21 16:18 ` [PATCH 9/9] Bluetooth: Fix clearing of persistent dev_flags Marcel Holtmann
2012-02-21 16:09 ` [PATCH 1/9] Bluetooth: mgmt: Fix powered checks for commands Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329840005-4977-9-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).