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

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

Bluetooth: Remove unnecessary mgmt_advertising function 



Since the real advertising state is now tracked with its own flag we can
simply set/unset the HCI_ADVERTISING flag in the
set_advertising_complete function.

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

include/net/bluetooth/hci_core.h

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

void mgmt_discoverable_timeout(struct hci_dev *hdev);

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

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

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

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_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

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

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

		       bool persistent);

		       bool persistent);

net/bluetooth/hci_event.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1080,8 +1080,6 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 
		clear_bit(HCI_LE_ADV, &hdev->dev_flags);

		clear_bit(HCI_LE_ADV, &hdev->dev_flags);

	}

	}





	mgmt_advertising(hdev, *sent);



	hci_dev_unlock(hdev);

	hci_dev_unlock(hdev);

}

}

net/bluetooth/mgmt.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -4034,6 +4034,11 @@ static void set_advertising_complete(struct hci_dev *hdev, u8 status) 
		return;

		return;

	}

	}





	if (test_bit(HCI_LE_ADV, &hdev->dev_flags))

		set_bit(HCI_ADVERTISING, &hdev->dev_flags);

	else

		clear_bit(HCI_ADVERTISING, &hdev->dev_flags);



	mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, settings_rsp,

	mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, settings_rsp,

			     &match);

			     &match);
@@ -5978,18 +5983,6 @@ void mgmt_connectable(struct hci_dev *hdev, u8 connectable) 
		new_settings(hdev, NULL);

		new_settings(hdev, NULL);

}

}





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

		clear_bit(HCI_ADVERTISING, &hdev->dev_flags);

}



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

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

{

{

	u8 mgmt_err = mgmt_status(status);

	u8 mgmt_err = mgmt_status(status);