Commit 778b235a authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Move HCI_ADVERTISING handling into mgmt.c 



We'll soon need to make decisions on toggling the HCI_ADVERTISING flag
based on pending mgmt_set_powered commands. Therefore, move the handling
from hci_event.c into mgmt.c.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f4f07505

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered); 
void mgmt_discoverable_timeout(struct hci_dev *hdev);

void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);

void mgmt_connectable(struct hci_dev *hdev, u8 connectable);

void mgmt_advertising(struct hci_dev *hdev, u8 advertising);

void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

		       bool persistent);

net/bluetooth/hci_event.c

+2 −6
Original line number Diff line number Diff line
@@ -991,12 +991,8 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 


	hci_dev_lock(hdev);



	if (!status) {

		if (*sent)

			set_bit(HCI_ADVERTISING, &hdev->dev_flags);

		else

			clear_bit(HCI_ADVERTISING, &hdev->dev_flags);

	}

	if (!status)

		mgmt_advertising(hdev, *sent);



	hci_dev_unlock(hdev);

}

net/bluetooth/mgmt.c

+8 −0
Original line number Diff line number Diff line
@@ -4832,6 +4832,14 @@ void mgmt_connectable(struct hci_dev *hdev, u8 connectable) 
		new_settings(hdev, NULL);

}



void mgmt_advertising(struct hci_dev *hdev, u8 advertising)

{

	if (advertising)

		set_bit(HCI_ADVERTISING, &hdev->dev_flags);

	else

		clear_bit(HCI_ADVERTISING, &hdev->dev_flags);

}



void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status)

{

	u8 mgmt_err = mgmt_status(status);

CRA Git | Maintained and supported by SUSTech CRA and CCSE