Commit 46c0d947 authored by Christian Eggers's avatar Christian Eggers Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_sync: revert some mesh modifications 



This reverts minor parts of the changes made in commit b338d917
("Bluetooth: Implement support for Mesh"). It looks like these changes
were only made for development purposes but shouldn't have been part of
the commit.

Fixes: b338d917 ("Bluetooth: Implement support for Mesh")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristian Eggers <ceggers@arri.de>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 1f029b4e

net/bluetooth/hci_sync.c

+4 −12
Original line number Diff line number Diff line
@@ -1970,13 +1970,10 @@ static int hci_clear_adv_sets_sync(struct hci_dev *hdev, struct sock *sk) 
static int hci_clear_adv_sync(struct hci_dev *hdev, struct sock *sk, bool force)

{

	struct adv_info *adv, *n;

	int err = 0;



	if (ext_adv_capable(hdev))

		/* Remove all existing sets */

		err = hci_clear_adv_sets_sync(hdev, sk);

	if (ext_adv_capable(hdev))

		return err;

		return hci_clear_adv_sets_sync(hdev, sk);



	/* This is safe as long as there is no command send while the lock is

	 * held.
@@ -2004,13 +2001,11 @@ static int hci_clear_adv_sync(struct hci_dev *hdev, struct sock *sk, bool force) 
static int hci_remove_adv_sync(struct hci_dev *hdev, u8 instance,

			       struct sock *sk)

{

	int err = 0;

	int err;



	/* If we use extended advertising, instance has to be removed first. */

	if (ext_adv_capable(hdev))

		err = hci_remove_ext_adv_instance_sync(hdev, instance, sk);

	if (ext_adv_capable(hdev))

		return err;

		return hci_remove_ext_adv_instance_sync(hdev, instance, sk);



	/* This is safe as long as there is no command send while the lock is

	 * held.
@@ -2109,16 +2104,13 @@ int hci_read_tx_power_sync(struct hci_dev *hdev, __le16 handle, u8 type) 
int hci_disable_advertising_sync(struct hci_dev *hdev)

{

	u8 enable = 0x00;

	int err = 0;



	/* If controller is not advertising we are done. */

	if (!hci_dev_test_flag(hdev, HCI_LE_ADV))

		return 0;



	if (ext_adv_capable(hdev))

		err = hci_disable_ext_adv_instance_sync(hdev, 0x00);

	if (ext_adv_capable(hdev))

		return err;

		return hci_disable_ext_adv_instance_sync(hdev, 0x00);



	return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_ADV_ENABLE,

				     sizeof(enable), &enable, HCI_CMD_TIMEOUT);