diff options
| author | Hemant Gupta <hemant.gupta@stericsson.com> | 2012-01-23 15:36:11 +0530 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:32 +0200 |
| commit | 95947a391ebe685b9870cd25cac1433aedf5d49c (patch) | |
| tree | 8b4b7278359613d76ff9a8d20a0c6800f08c08bd /net/bluetooth/hci_event.c | |
| parent | 7a7f1e7c857959f5298020969741e389f21edbae (diff) | |
| download | linux-stable-95947a391ebe685b9870cd25cac1433aedf5d49c.tar.gz linux-stable-95947a391ebe685b9870cd25cac1433aedf5d49c.tar.bz2 linux-stable-95947a391ebe685b9870cd25cac1433aedf5d49c.zip | |
Bluetooth: Fix clearing of debug and linkkey flags
This patch fixes clearing of HCI_LINK_KEYS and HCI_DEBUG_KEYS
dev_flags while resetting. Without this patch pairing does
not work over management interface for BR-EDR devices.
Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -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 041a35eb25c6..a86f82b11316 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -196,7 +196,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); + hdev->dev_flags &= BIT(HCI_MGMT) | BIT(HCI_SETUP) | BIT(HCI_AUTO_OFF) | + BIT(HCI_LINK_KEYS) | BIT(HCI_DEBUG_KEYS); } static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) |