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

Commit 16ab91ab authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Add timeout field to mgmt_set_discoverable 



Based on the revised mgmt API set_discoverable has a timeout parameter
to specify how long the adapter will remain discoverable. A value of 0
means "indefinitively".

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 89352e7d

include/net/bluetooth/hci_core.h

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ struct hci_dev { 
	struct work_struct	power_off;

	struct timer_list	off_timer;



	__u16			discov_timeout;

	struct delayed_work	discov_off;



	struct timer_list	cmd_timer;

	struct tasklet_struct	cmd_task;

	struct tasklet_struct	rx_task;

include/net/bluetooth/mgmt.h

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ struct mgmt_mode { 
#define MGMT_OP_SET_POWERED		0x0005



#define MGMT_OP_SET_DISCOVERABLE	0x0006

struct mgmt_cp_set_discoverable {

	__u8 val;

	__u16 timeout;

} __packed;



#define MGMT_OP_SET_CONNECTABLE		0x0007

net/bluetooth/hci_core.c

+25 −0
Original line number Diff line number Diff line
@@ -595,6 +595,11 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	tasklet_kill(&hdev->rx_task);

	tasklet_kill(&hdev->tx_task);



	if (hdev->discov_timeout > 0) {

		cancel_delayed_work_sync(&hdev->discov_off);

		hdev->discov_timeout = 0;

	}



	hci_dev_lock_bh(hdev);

	inquiry_cache_flush(hdev);

	hci_conn_hash_flush(hdev);
@@ -968,6 +973,24 @@ void hci_del_off_timer(struct hci_dev *hdev) 
	del_timer(&hdev->off_timer);

}



static void hci_discov_off(struct work_struct *work)

{

	struct hci_dev *hdev;

	u8 scan = SCAN_PAGE;



	hdev = container_of(work, struct hci_dev, discov_off.work);



	BT_DBG("%s", hdev->name);



	hci_dev_lock_bh(hdev);



	hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, sizeof(scan), &scan);



	hdev->discov_timeout = 0;



	hci_dev_unlock_bh(hdev);

}



int hci_uuids_clear(struct hci_dev *hdev)

{

	struct list_head *p, *n;
@@ -1485,6 +1508,8 @@ int hci_register_dev(struct hci_dev *hdev) 
	INIT_WORK(&hdev->power_off, hci_power_off);

	setup_timer(&hdev->off_timer, hci_auto_off, (unsigned long) hdev);



	INIT_DELAYED_WORK(&hdev->discov_off, hci_discov_off);



	memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));



	atomic_set(&hdev->promisc, 0);

net/bluetooth/hci_event.c

+5 −0
Original line number Diff line number Diff line
@@ -292,6 +292,11 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) 
		set_bit(HCI_ISCAN, &hdev->flags);

		if (!old_iscan)

			mgmt_discoverable(hdev->id, 1);

		if (hdev->discov_timeout > 0) {

			int to = msecs_to_jiffies(hdev->discov_timeout * 1000);

			queue_delayed_work(hdev->workqueue, &hdev->discov_off,

									to);

		}

	} else if (old_iscan)

		mgmt_discoverable(hdev->id, 0);

net/bluetooth/mgmt.c

+6 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ failed: 
static int set_discoverable(struct sock *sk, u16 index, unsigned char *data,

									u16 len)

{

	struct mgmt_mode *cp;

	struct mgmt_cp_set_discoverable *cp;

	struct hci_dev *hdev;

	struct pending_cmd *cmd;

	u8 scan;
@@ -396,11 +396,16 @@ static int set_discoverable(struct sock *sk, u16 index, unsigned char *data, 


	if (cp->val)

		scan |= SCAN_INQUIRY;

	else

		cancel_delayed_work_sync(&hdev->discov_off);



	err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);

	if (err < 0)

		mgmt_pending_remove(cmd);



	if (cp->val)

		hdev->discov_timeout = get_unaligned_le16(&cp->timeout);



failed:

	hci_dev_unlock_bh(hdev);

	hci_dev_put(hdev);