Commit f1550478 authored Oct 24, 2012 by Johan Hedberg Committed by Gustavo Padovan Nov 01, 2012

Bluetooth: Disallow LE scanning and connecting in peripheral role

When an adapter is in the LE peripheral role scanning for other devices
or initiating connections to them is not allowed. This patch makes sure
that such attempts will result in appropriate error returns.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 33f8f526

net/bluetooth/hci_conn.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -502,6 +502,9 @@ static struct hci_conn hci_connect_le(struct hci_dev hdev, bdaddr_t *dst,
		{
		struct hci_conn *le;

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

		le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
		if (!le) {
		le = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);

net/bluetooth/hci_core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1577,6 +1577,9 @@ int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,

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

		if (test_bit(HCI_LE_PERIPHERAL, &hdev->dev_flags))
		return -ENOTSUPP;

		if (work_busy(&hdev->le_scan))
		return -EINPROGRESS;