aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-01-28 12:56:01 -0500
committerMarcel Holtmann <marcel@holtmann.org>2015-01-28 15:26:23 -0500
commit39c5d970d4d1302d3407e0471c55520dd5537069 (patch)
tree06955df358f85a878c6d6b2350c0a13c89f96ad8 /net/bluetooth
parent592002863a03bd172a19d04854c5ed415693911f (diff)
Bluetooth: Fix notifying discovery state upon reset
When HCI_Reset is issued the discovery state is assumed to be stopped. The hci_cc_reset() handler was trying to set the state but it was doing it without using the hci_discovery_set_state() function. Because of this e.g. the mgmt Discovering event could go without being sent. This patch fixes the code to use the hci_discovery_set_state() function instead of just blindly setting the state value. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 00c160634e7b..4175470ff48e 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -200,7 +200,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
200 /* Reset all non-persistent flags */ 200 /* Reset all non-persistent flags */
201 hdev->dev_flags &= ~HCI_PERSISTENT_MASK; 201 hdev->dev_flags &= ~HCI_PERSISTENT_MASK;
202 202
203 hdev->discovery.state = DISCOVERY_STOPPED; 203 hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
204
204 hdev->inq_tx_power = HCI_TX_POWER_INVALID; 205 hdev->inq_tx_power = HCI_TX_POWER_INVALID;
205 hdev->adv_tx_power = HCI_TX_POWER_INVALID; 206 hdev->adv_tx_power = HCI_TX_POWER_INVALID;
206 207