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

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

Bluetooth: Rename HCI_LE_PERIPHERAL to HCI_ADVERTISING



This flag is used to indicate whether we want to have advertising
enabled or not, so give it a more suitable name.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 46a190cb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ enum {
	HCI_SSP_ENABLED,
	HCI_HS_ENABLED,
	HCI_LE_ENABLED,
	HCI_LE_PERIPHERAL,
	HCI_ADVERTISING,
	HCI_CONNECTABLE,
	HCI_DISCOVERABLE,
	HCI_LINK_SECURITY,
+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
{
	struct hci_conn *conn;

	if (test_bit(HCI_LE_PERIPHERAL, &hdev->flags))
	if (test_bit(HCI_ADVERTISING, &hdev->flags))
		return ERR_PTR(-ENOTSUPP);

	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static u8 create_ad(struct hci_dev *hdev, u8 *ptr)
	u8 ad_len = 0, flags = 0;
	size_t name_len;

	if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags))
	if (test_bit(HCI_ADVERTISING, &hdev->dev_flags))
		flags |= LE_AD_GENERAL;

	if (test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {
+3 −3
Original line number Diff line number Diff line
@@ -918,9 +918,9 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb)

	if (!status) {
		if (*sent)
			set_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags);
			set_bit(HCI_ADVERTISING, &hdev->dev_flags);
		else
			clear_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags);
			clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
	}

	if (!test_bit(HCI_INIT, &hdev->flags)) {
@@ -1005,7 +1005,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
		} else {
			hdev->features[1][0] &= ~LMP_HOST_LE;
			clear_bit(HCI_LE_ENABLED, &hdev->dev_flags);
			clear_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags);
			clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
		}

		if (sent->simul)
+9 −9
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static u32 get_current_settings(struct hci_dev *hdev)
	if (test_bit(HCI_HS_ENABLED, &hdev->dev_flags))
		settings |= MGMT_SETTING_HS;

	if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags))
	if (test_bit(HCI_ADVERTISING, &hdev->dev_flags))
		settings |= MGMT_SETTING_ADVERTISING;

	return settings;
@@ -1463,8 +1463,8 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
			changed = true;
		}

		if (!val && test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags)) {
			clear_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags);
		if (!val && test_bit(HCI_ADVERTISING, &hdev->dev_flags)) {
			clear_bit(HCI_ADVERTISING, &hdev->dev_flags);
			changed = true;
		}

@@ -1500,7 +1500,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)

	hci_req_init(&req, hdev);

	if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags) && !val)
	if (test_bit(HCI_ADVERTISING, &hdev->dev_flags) && !val)
		hci_req_add(&req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(val), &val);

	hci_req_add(&req, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(hci_cp),
@@ -2888,7 +2888,7 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
			goto failed;
		}

		if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags)) {
		if (test_bit(HCI_ADVERTISING, &hdev->dev_flags)) {
			err = cmd_status(sk, hdev->id, MGMT_OP_START_DISCOVERY,
					 MGMT_STATUS_REJECTED);
			mgmt_pending_remove(cmd);
@@ -3236,13 +3236,13 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data, u1
	hci_dev_lock(hdev);

	val = !!cp->val;
	enabled = test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags);
	enabled = test_bit(HCI_ADVERTISING, &hdev->dev_flags);

	if (!hdev_is_powered(hdev) || val == enabled) {
		bool changed = false;

		if (val != test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags)) {
			change_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags);
		if (val != test_bit(HCI_ADVERTISING, &hdev->dev_flags)) {
			change_bit(HCI_ADVERTISING, &hdev->dev_flags);
			changed = true;
		}

@@ -3851,7 +3851,7 @@ static int powered_update_hci(struct hci_dev *hdev)
				    &hdev->static_addr);
	}

	if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags)) {
	if (test_bit(HCI_ADVERTISING, &hdev->dev_flags)) {
		u8 adv = 0x01;

		hci_req_add(&req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(adv), &adv);