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

Commit 36f7fc7e authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Clean up logic in hci_cc_write_scan_enable 



This patch adds a new label to hci_cc_write_scan_enable to avoid
unnecessary indentation. This will be convenient especially when new
code for the discoverable timeout gets added.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent abc545b8

net/bluetooth/hci_event.c

+21 −19
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb) 


static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)

{

	__u8 status = *((__u8 *) skb->data);

	__u8 param, status = *((__u8 *) skb->data);

	int old_pscan, old_iscan;

	void *sent;



	BT_DBG("%s status 0x%x", hdev->name, status);
@@ -283,9 +284,10 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) 
	if (!sent)

		return;



	if (!status) {

		__u8 param = *((__u8 *) sent);

		int old_pscan, old_iscan;

	if (status != 0)

		goto done;



	param = *((__u8 *) sent);



	old_pscan = test_and_clear_bit(HCI_PSCAN, &hdev->flags);

	old_iscan = test_and_clear_bit(HCI_ISCAN, &hdev->flags);
@@ -303,8 +305,8 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) 
			mgmt_connectable(hdev->id, 1);

	} else if (old_pscan)

		mgmt_connectable(hdev->id, 0);

	}



done:

	hci_req_complete(hdev, HCI_OP_WRITE_SCAN_ENABLE, status);

}