[PATCH v3 1/2] Bluetooth: mgmt: Fix enabling SSP while powered off

[PATCH v3 1/2] Bluetooth: mgmt: Fix enabling SSP while powered off

[Andrzej Kaczmarek]

When new BT USB adapter is plugged in it's configured while still being powered
off (HCI_AUTO_OFF flag is set), thus Set SSP will only set dev_flags but won't
write changes to controller. As a result remote devices won't use Secure Simple
Pairing with our device due to SSP Host Support flag disabled in extended
features and may also reject SSP attempt from our side (with possible fallback
to legacy pairing).

This patch ensures HCI Write Simple Pairing Mode is sent when Set Powered is
called to power on controller and clear HCI_AUTO_OFF flag.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Cc: stable@vger.kernel.org
---
 net/bluetooth/mgmt.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 05d4b83..ccc6716 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2891,6 +2891,12 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
 		if (scan)
 			hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
 
+		if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
+			u8 ssp = 1;
+
+			hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &ssp);
+		}
+
 		update_class(hdev);
 		update_name(hdev, hdev->dev_name);
 		update_eir(hdev);
-- 
1.7.11.3

[PATCH v3 2/2] Bluetooth: mgmt: Fix enabling LE while powered off

[Andrzej Kaczmarek]

When new BT USB adapter is plugged in it's configured while still being powered
off (HCI_AUTO_OFF flag is set), thus Set LE will only set dev_flags but won't
write changes to controller. As a result it's not possible to start device
discovery session on LE controller as it uses interleaved discovery which
requires LE Supported Host flag in extended features.

This patch ensures HCI Write LE Host Supported is sent when Set Powered is
called to power on controller and clear HCI_AUTO_OFF flag.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Cc: stable@vger.kernel.org
---
 net/bluetooth/mgmt.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ccc6716..57ce7cd 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2897,6 +2897,16 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
 			hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &ssp);
 		}
 
+		if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
+			struct hci_cp_write_le_host_supported cp;
+
+			cp.le = 1;
+			cp.simul = !!(hdev->features[6] & LMP_SIMUL_LE_BR);
+
+			hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED,
+				     sizeof(cp), &cp);
+		}
+
 		update_class(hdev);
 		update_name(hdev, hdev->dev_name);
 		update_eir(hdev);
-- 
1.7.11.3

Re: [PATCH v3 1/2] Bluetooth: mgmt: Fix enabling SSP while powered off

[Johan Hedberg]

Hi Andrzej,

On Wed, Aug 29, 2012, Andrzej Kaczmarek wrote:
> When new BT USB adapter is plugged in it's configured while still being powered
> off (HCI_AUTO_OFF flag is set), thus Set SSP will only set dev_flags but won't
> write changes to controller. As a result remote devices won't use Secure Simple
> Pairing with our device due to SSP Host Support flag disabled in extended
> features and may also reject SSP attempt from our side (with possible fallback
> to legacy pairing).
> 
> This patch ensures HCI Write Simple Pairing Mode is sent when Set Powered is
> called to power on controller and clear HCI_AUTO_OFF flag.
> 
> Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
> Cc: stable@vger.kernel.org
> ---
>  net/bluetooth/mgmt.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Acked-by: Johan Hedberg <johan.hedberg@intel.com>

Johan

Re: [PATCH v3 2/2] Bluetooth: mgmt: Fix enabling LE while powered off

[Johan Hedberg]

Hi Andrzej,

On Wed, Aug 29, 2012, Andrzej Kaczmarek wrote:
> When new BT USB adapter is plugged in it's configured while still being powered
> off (HCI_AUTO_OFF flag is set), thus Set LE will only set dev_flags but won't
> write changes to controller. As a result it's not possible to start device
> discovery session on LE controller as it uses interleaved discovery which
> requires LE Supported Host flag in extended features.
> 
> This patch ensures HCI Write LE Host Supported is sent when Set Powered is
> called to power on controller and clear HCI_AUTO_OFF flag.
> 
> Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
> Cc: stable@vger.kernel.org
> ---
>  net/bluetooth/mgmt.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)

Acked-by: Johan Hedberg <johan.hedberg@intel.com>

Johan

Re: [PATCH v3 2/2] Bluetooth: mgmt: Fix enabling LE while powered off

[Gustavo Padovan]

Hi Andrzej,

* Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> [2012-08-29 10:02:09 +0200]:

> When new BT USB adapter is plugged in it's configured while still being powered
> off (HCI_AUTO_OFF flag is set), thus Set LE will only set dev_flags but won't
> write changes to controller. As a result it's not possible to start device
> discovery session on LE controller as it uses interleaved discovery which
> requires LE Supported Host flag in extended features.
> 
> This patch ensures HCI Write LE Host Supported is sent when Set Powered is
> called to power on controller and clear HCI_AUTO_OFF flag.
> 
> Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
> Cc: stable@vger.kernel.org
> ---
>  net/bluetooth/mgmt.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)

Both patches have been applied to bluetooth.git. Thanks

	Gustavo