diff options
| author | Andre Guedes <andre.guedes@openbossa.org> | 2012-02-23 16:50:05 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-23 16:51:47 +0200 |
| commit | 69775ff6d101ccf435bd26ae822c24bbb20e11cf (patch) | |
| tree | 7e138bfb91d6aad28f879164e9b64702acad955c /net/bluetooth | |
| parent | 60fc5fb66efa0bcbe028637206ed59df8cd4ac19 (diff) | |
| download | linux-3.10-69775ff6d101ccf435bd26ae822c24bbb20e11cf.tar.gz linux-3.10-69775ff6d101ccf435bd26ae822c24bbb20e11cf.tar.bz2 linux-3.10-69775ff6d101ccf435bd26ae822c24bbb20e11cf.zip | |
Bluetooth: Set DISCOVERY_STOPPED if controller resets
If controller is reset during the discovery procedure, Start Discovery
command stops working. This can be easily reproduced by running
"hciconfig hci0 reset" while discovering devices, for instance.
We should force discovery state to DISCOVERY_STOPPED in case we receive
a reset command complete event. Otherwise we may stuck in one of the
active discovery states (DISCOVERY_INQUIRY, DISCOVERY_LE_SCAN and
DISCOVERY_RESOLVING) and subsequent Start Discovery commands will simply
fail.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 276f3ac0608..3d1eef0df2a 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -194,6 +194,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) /* Reset all non-persistent flags */ hdev->dev_flags &= ~(BIT(HCI_LE_SCAN)); + + hdev->discovery.state = DISCOVERY_STOPPED; } static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) |