Commit 7c4cfab8 authored Feb 24, 2014 by Johan Hedberg Committed by Marcel Holtmann Feb 24, 2014

Bluetooth: Don't clear HCI_ADVERTISING when powering off

Once mgmt_set_powered(off) is updated to clear the scan mode we should
not just blindly clear the HCI_ADVERTISING flag in mgmt_advertising()
but first check if there is a pending set_powered operation.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent ce3f24cf

net/bluetooth/mgmt.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4842,6 +4842,10 @@ void mgmt_connectable(struct hci_dev *hdev, u8 connectable)

		void mgmt_advertising(struct hci_dev *hdev, u8 advertising)
		{
		/* Powering off may stop advertising - don't let that interfere */
		if (!advertising && mgmt_pending_find(MGMT_OP_SET_POWERED, hdev))
		return;

		if (advertising)
		set_bit(HCI_ADVERTISING, &hdev->dev_flags);
		else

Admin message