Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f4785c authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Remove stop discovery handling from hci_event.c 



Since all mgmt stop discovery command complete events are now handled
in stop_discovery_complete callback in mgmt.c, we can remove this
handling from hci_event.c.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 0e05bba6

net/bluetooth/hci_event.c

+2 −14
Original line number Diff line number Diff line
@@ -40,21 +40,13 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%2.2x", hdev->name, status);



	if (status) {

		hci_dev_lock(hdev);

		mgmt_stop_discovery_failed(hdev, status);

		hci_dev_unlock(hdev);

	if (status)

		return;

	}



	clear_bit(HCI_INQUIRY, &hdev->flags);

	smp_mb__after_clear_bit(); /* wake_up_bit advises about this barrier */

	wake_up_bit(&hdev->flags, HCI_INQUIRY);



	hci_dev_lock(hdev);

	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);

	hci_dev_unlock(hdev);



	hci_conn_check_pending(hdev);

}
@@ -966,12 +958,8 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 
		break;



	case LE_SCAN_DISABLE:

		if (status) {

			hci_dev_lock(hdev);

			mgmt_stop_discovery_failed(hdev, status);

			hci_dev_unlock(hdev);

		if (status)

			return;

		}



		clear_bit(HCI_LE_SCAN, &hdev->dev_flags);

		break;