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

Commit d23264a8 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Add dev_flags to struct hci_dev 



This patch adds the dev_flags field to struct hci_dev. This new
flags variable should be used to define flags related to BR/EDR
and/or LE controller itself. It should be used to define flags
which represents states from the controller. The dev_flags is
cleared in case the controller sends a Reset Command Complete
Event to the host.

Also, this patch adds the HCI_LE_SCAN flag which was created to
track if the controller is performing LE scan or not. The flag
is set/cleared when the controller starts/stops scanning.

This is an initial effort to stop using hdev->flags to define
internal flags since it is exported to userspace by an ioctl.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 1e89cffb

include/net/bluetooth/hci.h

+8 −0
Original line number Diff line number Diff line
@@ -88,6 +88,14 @@ enum { 
	HCI_RESET,

};



/*

 * BR/EDR and/or LE controller flags: the flags defined here should represent

 * states from the controller.

 */

enum {

	HCI_LE_SCAN,

};



/* HCI ioctl defines */

#define HCIDEVUP	_IOW('H', 201, int)

#define HCIDEVDOWN	_IOW('H', 202, int)

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ struct hci_dev { 


	struct module		*owner;



	unsigned long		dev_flags;



	int (*open)(struct hci_dev *hdev);

	int (*close)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,7 @@ int hci_register_dev(struct hci_dev *hdev) 
	spin_lock_init(&hdev->lock);



	hdev->flags = 0;

	hdev->dev_flags = 0;

	hdev->pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);

	hdev->esco_type = (ESCO_HV1);

	hdev->link_mode = (HCI_LM_ACCEPT);

net/bluetooth/hci_event.c

+6 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
	clear_bit(HCI_RESET, &hdev->flags);



	hci_req_complete(hdev, HCI_OP_RESET, status);



	hdev->dev_flags = 0;

}



static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
@@ -1006,12 +1008,16 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 
		return;



	if (cp->enable == 0x01) {

		set_bit(HCI_LE_SCAN, &hdev->dev_flags);



		del_timer(&hdev->adv_timer);



		hci_dev_lock(hdev);

		hci_adv_entries_clear(hdev);

		hci_dev_unlock(hdev);

	} else if (cp->enable == 0x00) {

		clear_bit(HCI_LE_SCAN, &hdev->dev_flags);



		mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT);

	}

}