Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: Set HCI_PAIRABLE during power on for legacy ioctl

Browse source 
When the controller is brought up using legacy ioctl, the setting of
the HCI_PAIRABLE flag should happen then. Previously it was set during
enumeration and when retrieving device information.

This change also will not set the HCI_PAIRABLE flag when the controller
is used with the HCI User Channel operation.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-07-10 15:25:22 +02:00 • committed by Johan Hedberg
parent 2e84d8db91
commit 12aa4f0a3d
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/bluetooth/hci_core.c
View file

@ -2435,6 +2435,16 @@ int hci_dev_open(__u16 dev)
*/ */
flush_workqueue(hdev->req_workqueue); flush_workqueue(hdev->req_workqueue);
/* For controllers not using the management interface and that
* are brought up using legacy ioctl, set the HCI_PAIRABLE bit
* so that pairing works for them. Once the management interface
* is in use this bit will be cleared again and userspace has
* to explicitly enable it.
*/
if (!test_bit(HCI_USER_CHANNEL, &hdev->dev_flags) &&
!test_bit(HCI_MGMT, &hdev->dev_flags))
set_bit(HCI_PAIRABLE, &hdev->dev_flags);
err = hci_dev_do_open(hdev); err = hci_dev_do_open(hdev);
done: done:
@ -2826,9 +2836,6 @@ int hci_get_dev_list(void __user *arg)
if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
flags &= ~BIT(HCI_UP); flags &= ~BIT(HCI_UP);
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
set_bit(HCI_PAIRABLE, &hdev->dev_flags);
(dr + n)->dev_id = hdev->id; (dr + n)->dev_id = hdev->id;
(dr + n)->dev_opt = flags; (dr + n)->dev_opt = flags;
@ -2869,9 +2876,6 @@ int hci_get_dev_info(void __user *arg)
else else
flags = hdev->flags; flags = hdev->flags;
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
set_bit(HCI_PAIRABLE, &hdev->dev_flags);
strcpy(di.name, hdev->name); strcpy(di.name, hdev->name);
di.bdaddr = hdev->bdaddr; di.bdaddr = hdev->bdaddr;
di.type = (hdev->bus & 0x0f) | ((hdev->dev_type & 0x03) << 4); di.type = (hdev->bus & 0x0f) | ((hdev->dev_type & 0x03) << 4);