Commit ebc99feb authored Jan 04, 2011 by Johan Hedberg Committed by Gustavo F. Padovan Feb 08, 2011

Bluetooth: Add flag to track managment controlled adapters

This patch adds a HCI_MGMT flag to track adapters which are under the
control of the management interface. This is needed to make sure that
new kernels will work with old user space versions. I.e. behaviour which
could break old user space versions (but is needed by the management
interface) should not be exhibited when the HCI_MGMT flag is not set.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 72a734ec

include/net/bluetooth/hci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ enum {

		HCI_SETUP,
		HCI_AUTO_OFF,
		HCI_MGMT,
		};

		/* HCI ioctl defines */

net/bluetooth/mgmt.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,8 @@ static int read_index_list(struct sock *sk)

		hci_del_off_timer(d);

		set_bit(HCI_MGMT, &d->flags);

		if (test_bit(HCI_SETUP, &d->flags))
		continue;

		@@ -200,6 +202,8 @@ static int read_controller_info(struct sock sk, unsigned char data, u16 len)

		hci_dev_lock_bh(hdev);

		set_bit(HCI_MGMT, &hdev->flags);

		put_unaligned_le16(hdev->id, &rp->index);
		rp->type = hdev->dev_type;

Admin message