linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] android/hidhost: Fix connecting HOGP over BREDR
@ 2015-05-19  8:25 Mariusz Skamra
  2015-05-19  8:56 ` [PATCHv2] " Mariusz Skamra
  0 siblings, 1 reply; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-19  8:25 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Mariusz Skamra

This patch fixes issue related to HID connection over BREDR.
To avoid HOG connection with dual mode device connected over
BREDR, bdaddr_type is checked, so that 'if' condition tests
connection type, not the features of remote device.
---
 android/hidhost.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/hidhost.c b/android/hidhost.c
index 729b884..100432f 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -874,6 +874,7 @@ static void bt_hid_connect(const void *buf, uint16_t len)
 	bdaddr_t dst;
 	GSList *l;
 	uuid_t uuid;
+	uint8_t bdaddr_type;
 
 	DBG("");
 
@@ -891,7 +892,9 @@ static void bt_hid_connect(const void *buf, uint16_t len)
 	ba2str(&dev->dst, addr);
 	DBG("connecting to %s", addr);
 
-	if (bt_is_device_le(&dst)) {
+	bt_get_id_addr(&dst, &bdaddr_type);
+
+	if (bdaddr_type != BDADDR_BREDR) {
 		if (!hog_connect(dev)) {
 			status = HAL_STATUS_FAILED;
 			hid_device_remove(dev);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCHv2] android/hidhost: Fix connecting HOGP over BREDR
  2015-05-19  8:25 [PATCH] android/hidhost: Fix connecting HOGP over BREDR Mariusz Skamra
@ 2015-05-19  8:56 ` Mariusz Skamra
  2015-05-19 14:09   ` Szymon Janc
  0 siblings, 1 reply; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-19  8:56 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Mariusz Skamra

This patch fixes issue related to HID connection over BREDR.
To avoid HOG connection with dual mode device connected over
BREDR, bearer type is checked not the features of remote device.
---
 android/hidhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/hidhost.c b/android/hidhost.c
index 729b884..1543685 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -891,7 +891,7 @@ static void bt_hid_connect(const void *buf, uint16_t len)
 	ba2str(&dev->dst, addr);
 	DBG("connecting to %s", addr);
 
-	if (bt_is_device_le(&dst)) {
+	if (bt_device_last_seen_bearer(&dev->dst)) {
 		if (!hog_connect(dev)) {
 			status = HAL_STATUS_FAILED;
 			hid_device_remove(dev);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCHv2] android/hidhost: Fix connecting HOGP over BREDR
  2015-05-19  8:56 ` [PATCHv2] " Mariusz Skamra
@ 2015-05-19 14:09   ` Szymon Janc
  2015-05-20  9:55     ` [PATCHv2] android/pts: Update SM test results Mariusz Skamra
  2015-05-20  9:56     ` [PATCHv3] android/hidhost: Fix connecting HOGP over BREDR Mariusz Skamra
  0 siblings, 2 replies; 7+ messages in thread
From: Szymon Janc @ 2015-05-19 14:09 UTC (permalink / raw)
  To: Mariusz Skamra; +Cc: linux-bluetooth

Hi Mariusz,

On Tuesday 19 of May 2015 10:56:28 Mariusz Skamra wrote:
> This patch fixes issue related to HID connection over BREDR.
> To avoid HOG connection with dual mode device connected over
> BREDR, bearer type is checked not the features of remote device.
> ---
>  android/hidhost.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/android/hidhost.c b/android/hidhost.c
> index 729b884..1543685 100644
> --- a/android/hidhost.c
> +++ b/android/hidhost.c
> @@ -891,7 +891,7 @@ static void bt_hid_connect(const void *buf, uint16_t
> len) ba2str(&dev->dst, addr);
>  	DBG("connecting to %s", addr);
> 
> -	if (bt_is_device_le(&dst)) {
> +	if (bt_device_last_seen_bearer(&dev->dst)) {

I'd prefer explicit check
if (bt_device_last_seen_bearer(&dev->dst) != BDADDR_BREDR)

>  		if (!hog_connect(dev)) {
>  			status = HAL_STATUS_FAILED;
>  			hid_device_remove(dev);

-- 
BR
Szymon Janc

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCHv2] android/pts: Update SM test results
  2015-05-19 14:09   ` Szymon Janc
@ 2015-05-20  9:55     ` Mariusz Skamra
  2015-05-22 13:13       ` Szymon Janc
  2015-05-20  9:56     ` [PATCHv3] android/hidhost: Fix connecting HOGP over BREDR Mariusz Skamra
  1 sibling, 1 reply; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-20  9:55 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Mariusz Skamra

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 7046 bytes --]

PTS 6.1 and Android 5.1
---
 android/pics-sm.txt  | 23 ++++++++++++++---------
 android/pixit-sm.txt |  2 +-
 android/pts-sm.txt   | 36 +++++++++++-------------------------
 3 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/android/pics-sm.txt b/android/pics-sm.txt
index c5caec6..c31fe76 100644
--- a/android/pics-sm.txt
+++ b/android/pics-sm.txt
@@ -1,8 +1,9 @@
 SM PICS for the PTS tool.
 
-PTS version: 6.0
+PTS version: 6.1
 
 * - different than PTS defaults
+^ - field not available on PTS
 
 M - mandatory
 O - optional
@@ -12,9 +13,11 @@ O - optional
 Parameter Name	Selected	Description
 -------------------------------------------------------------------------------
 TSPC_SM_1_1	True		Master Role (Initiator) (C.1)
-TSPC_SM_1_2	True		Slave Role (Responder) (C.1)
+TSPC_SM_1_2	True		Slave Role (Responder) (C.2)
 -------------------------------------------------------------------------------
-C.1: At least one of these features shall be supported.
+C.1: Mandatory to support if TSPC_SM_1_2 is NOT supported, otherwise Optional
+C.2: Optional IF ((4.0 OR 4.0+HS) AND TSPC_GAP_5_3) OR ((4.1 OR 4.1+HS OR 4.2
+	OR 4.2+HS) AND (TSPC_GAP_5_3 OR TSPC_GAP_38_3)))
 -------------------------------------------------------------------------------
 
 
@@ -26,8 +29,10 @@ TSPC_SM_2_1	True		Authenticated MITM protection (O)
 TSPC_SM_2_2	True		Unauthenticated no MITM protection (C.1)
 TSPC_SM_2_3	True		No security requirements (M)
 TSPC_SM_2_4	False (*)	OOB supported (O)
+TSPC_SM_2_5	(^)		LE Secure Connections (C.2)
 -------------------------------------------------------------------------------
 C.1: If TSPC_SM_2_1 is supported then Mandatory, else Optional
+C.2: Optional IF Core 4.2 OR Core 4.2+HS are supported, otherwise Excluded
 -------------------------------------------------------------------------------
 
 
@@ -47,8 +52,8 @@ TSPC_SM_4_1	True		Just Works (O)
 TSPC_SM_4_2	True		Passkey Entry (C.1)
 TSPC_SM_4_3	False (*)	Out of Band (C.1)
 -------------------------------------------------------------------------------
-C.1: If TSPC_SM_2_1 is supported, at least one of these features shall be
-	supported.
+C.1: Mandatory to support at least one of the defined methods IF TSPC_SM_2_1 is
+	supported, otherwise Excluded.
 -------------------------------------------------------------------------------
 
 
@@ -63,7 +68,7 @@ TSPC_SM_5_4	True		Slave Initiated Security – Master response(C.2)
 -------------------------------------------------------------------------------
 C.1: Mandatory if TSPC_SM_1_2 is supported, otherwise Excluded
 C.2: Mandatory if TSPC_SM_1_1 is supported, otherwise Excluded
-C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_1 OR TSPC_SM_2_4 is supported,
+C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_2 OR TSPC_SM_2_4 is supported,
 	otherwise Excluded
 -------------------------------------------------------------------------------
 
@@ -85,7 +90,7 @@ TSPC_SM_7_1	True		Encryption Key (C.1)
 TSPC_SM_7_2	True		Identity Key (C.2)
 TSPC_SM_7_3	True		Signing Key (C.3)
 -------------------------------------------------------------------------------
-C.1: Mandatory if GAP (24/2 OR 42/6) is supported, ELSE Optional
-C.2: Mandatory if GAP (26/3) is supported, ELSE Optional
-C.3: Mandatory if GAP (25/6 OR 35/6) is supported, ELSE Optional
+C.1: Mandatory if TSPC_GAP_24_2 OR TSPC_GAP_42_6 is supported, ELSE Optional
+C.2: Mandatory if TSPC_GAP_26_3 is supported, ELSE Optional
+C.3: Mandatory if TSPC_GAP_25_6 OR TSPC_GAP_35_6 is supported, ELSE Optional
 -------------------------------------------------------------------------------
diff --git a/android/pixit-sm.txt b/android/pixit-sm.txt
index 98e2ab5..6facbb8 100644
--- a/android/pixit-sm.txt
+++ b/android/pixit-sm.txt
@@ -1,6 +1,6 @@
 SM PIXIT for the PTS tool.
 
-PTS version: 6.0
+PTS version: 6.1
 
 * - different than PTS defaults
 & - should be set to IUT Bluetooth address
diff --git a/android/pts-sm.txt b/android/pts-sm.txt
index 91737cc..1fad305 100644
--- a/android/pts-sm.txt
+++ b/android/pts-sm.txt
@@ -1,9 +1,9 @@
 PTS test results for SM
 
-PTS version: 6.0
-Tested: 11-February-2015
-Android version: 5.0
-kernel version: 3.20
+PTS version: 6.1
+Tested: 04-May-2015
+Android version: 5.1
+kernel version: 4.1
 
 Results:
 PASS	test passed
@@ -24,12 +24,7 @@ TC_JW_BV_02_C		PASS	btmgmt advertising on
 TC_JW_BV_05_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
 TC_JW_BI_01_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
 TC_JW_BI_02_C		PASS	btmgmt pairable on
-TC_JW_BI_03_C		PASS	bluetoothd is NOT running
-				btmgmt power on
-				btmgmt le on
-				btmgmt connectable on
-				btmgmt pairable on
-				btmgmt discov on
+TC_JW_BI_03_C		PASS	btmgmt pairable on
 				btmgmt advertising on
 TC_JW_BI_04_C		PASS	btmgmt pairable off
 				btmgmg pair -c 0x03 -t 0x01 <addr>
@@ -38,8 +33,6 @@ TC_PKE_BV_01_C		PASS	btmgmt pairable off
 				Note: provide passkey to PTS
 TC_PKE_BV_02_C		PASS	btmgmt pairable off
 				btmgmt io-cap 0x04
-				btmgmt advertising on
-				btmgmt monitor
 				Note: provide passkey
 TC_PKE_BV_04_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
 TC_PKE_BV_05_C		PASS	btmgmt io-cap 0x04
@@ -50,7 +43,6 @@ TC_PKE_BI_02_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
 				Note: provide passkey
 TC_PKE_BI_03_C		PASS	btmgmt io-cap 0x04
 				btmgmt advertising on
-				btmgmt monitor
 				Note: Enter invalid passkey in PTS
 TC_OOB_BV_01_C		N/A
 TC_OOB_BV_02_C		N/A
@@ -59,12 +51,10 @@ TC_OOB_BV_04_C		N/A
 TC_OOB_BV_05_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
 				Note: Enter valid passkey in PTS
 TC_OOB_BV_06_C		PASS	btmgmt advertising on
-				btmgmt monitor
 				Note: Enter valid passkey in PTS
 TC_OOB_BV_07_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
 TC_OOB_BV_08_C		PASS	btmgmt advertising on
-				btmgmt monitor
-				Note: Accept pairing in btmgmt monitor
+				Note: Accept pairing in btmgmt
 TC_OOB_BV_09_C		N/A
 TC_OOB_BV_10_C		N/A
 TC_OOB_BI_01_C		N/A
@@ -72,10 +62,8 @@ TC_OOB_BI_02_C		N/A
 TC_EKS_BV_01_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
 				Note: Enter valid passkey in PTS
 TC_EKS_BV_02_C		PASS	btmgmt advertising on
-				btmgmt monitor
-				Note: Accept pairing in btmgmt monitor
-TC_EKS_BI_01_C		PASS	btmgmt io-cap 0x03
-				btmgmt pair -c 0x03 -t 0x01 <addr>
+				Note: Accept pairing in btmgmt
+TC_EKS_BI_01_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
 TC_EKS_BI_02_C		PASS	btmgmt advertising on
 TC_SIGN_BV_01_C		INC	PTS issue #12305
 TC_SIGN_BV_03_C		PASS	haltest:
@@ -108,9 +96,7 @@ TC_KDU_BV_05_C		PASS	PTS issue #12302
 TC_KDU_BV_06_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
 TC_KDU_BV_07_C		PASS	btmgmt pairable on
 TC_SIP_BV_01_C		PASS	btmgmt advertising on
-				btmgmt pair -c 0x03 -t 0x01 <addr>
-TC_SIP_BV_02_C		PASS	btmgmt advertising off
-				l2test -n -J4 -V le_public <addr>
-TC_SIE_BV_01_C		PASS	btmgmt advertising on
-				btmgmt pair -c 0x03 -t 0x01 <addr>
+TC_SIP_BV_02_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
+TC_SIE_BV_01_C		PASS	btmgmt io-cap 0x03
+				btmgmt advertising on
 -------------------------------------------------------------------------------
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCHv3] android/hidhost: Fix connecting HOGP over BREDR
  2015-05-19 14:09   ` Szymon Janc
  2015-05-20  9:55     ` [PATCHv2] android/pts: Update SM test results Mariusz Skamra
@ 2015-05-20  9:56     ` Mariusz Skamra
  2015-05-22 13:17       ` Szymon Janc
  1 sibling, 1 reply; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-20  9:56 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Mariusz Skamra

This patch fixes issue related to HID connection over BREDR.
To avoid HOG connection with dual mode device connected over
BREDR, bearer type is checked not the features of remote device.
---
 android/hidhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/hidhost.c b/android/hidhost.c
index 729b884..a2b820f 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -891,7 +891,7 @@ static void bt_hid_connect(const void *buf, uint16_t len)
 	ba2str(&dev->dst, addr);
 	DBG("connecting to %s", addr);
 
-	if (bt_is_device_le(&dst)) {
+	if (bt_device_last_seen_bearer(&dev->dst) != BDADDR_BREDR) {
 		if (!hog_connect(dev)) {
 			status = HAL_STATUS_FAILED;
 			hid_device_remove(dev);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCHv2] android/pts: Update SM test results
  2015-05-20  9:55     ` [PATCHv2] android/pts: Update SM test results Mariusz Skamra
@ 2015-05-22 13:13       ` Szymon Janc
  0 siblings, 0 replies; 7+ messages in thread
From: Szymon Janc @ 2015-05-22 13:13 UTC (permalink / raw)
  To: Mariusz Skamra; +Cc: linux-bluetooth

Hi Mariusz,

On Wednesday 20 of May 2015 11:55:03 Mariusz Skamra wrote:
> PTS 6.1 and Android 5.1
> ---
>  android/pics-sm.txt  | 23 ++++++++++++++---------
>  android/pixit-sm.txt |  2 +-
>  android/pts-sm.txt   | 36 +++++++++++-------------------------
>  3 files changed, 26 insertions(+), 35 deletions(-)
> 
> diff --git a/android/pics-sm.txt b/android/pics-sm.txt
> index c5caec6..c31fe76 100644
> --- a/android/pics-sm.txt
> +++ b/android/pics-sm.txt
> @@ -1,8 +1,9 @@
>  SM PICS for the PTS tool.
> 
> -PTS version: 6.0
> +PTS version: 6.1
> 
>  * - different than PTS defaults
> +^ - field not available on PTS
> 
>  M - mandatory
>  O - optional
> @@ -12,9 +13,11 @@ O - optional
>  Parameter Name	Selected	Description
>  ---------------------------------------------------------------------------
> ---- TSPC_SM_1_1	True		Master Role (Initiator) (C.1)
> -TSPC_SM_1_2	True		Slave Role (Responder) (C.1)
> +TSPC_SM_1_2	True		Slave Role (Responder) (C.2)
>  ---------------------------------------------------------------------------
> ---- -C.1: At least one of these features shall be supported.
> +C.1: Mandatory to support if TSPC_SM_1_2 is NOT supported, otherwise
> Optional +C.2: Optional IF ((4.0 OR 4.0+HS) AND TSPC_GAP_5_3) OR ((4.1 OR
> 4.1+HS OR 4.2 +	OR 4.2+HS) AND (TSPC_GAP_5_3 OR TSPC_GAP_38_3)))
>  ---------------------------------------------------------------------------
> ----
> 
> 
> @@ -26,8 +29,10 @@ TSPC_SM_2_1	True		Authenticated MITM protection 
(O)
>  TSPC_SM_2_2	True		Unauthenticated no MITM protection (C.1)
>  TSPC_SM_2_3	True		No security requirements (M)
>  TSPC_SM_2_4	False (*)	OOB supported (O)
> +TSPC_SM_2_5	(^)		LE Secure Connections (C.2)
>  ---------------------------------------------------------------------------
> ---- C.1: If TSPC_SM_2_1 is supported then Mandatory, else Optional
> +C.2: Optional IF Core 4.2 OR Core 4.2+HS are supported, otherwise Excluded
>  ---------------------------------------------------------------------------
> ----
> 
> 
> @@ -47,8 +52,8 @@ TSPC_SM_4_1	True		Just Works (O)
>  TSPC_SM_4_2	True		Passkey Entry (C.1)
>  TSPC_SM_4_3	False (*)	Out of Band (C.1)
>  ---------------------------------------------------------------------------
> ---- -C.1: If TSPC_SM_2_1 is supported, at least one of these features shall
> be -	supported.
> +C.1: Mandatory to support at least one of the defined methods IF
> TSPC_SM_2_1 is +	supported, otherwise Excluded.
>  ---------------------------------------------------------------------------
> ----
> 
> 
> @@ -63,7 +68,7 @@ TSPC_SM_5_4	True		Slave Initiated Security – Master
> response(C.2)
> ---------------------------------------------------------------------------
> ---- C.1: Mandatory if TSPC_SM_1_2 is supported, otherwise Excluded
>  C.2: Mandatory if TSPC_SM_1_1 is supported, otherwise Excluded
> -C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_1 OR TSPC_SM_2_4 is supported,
> +C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_2 OR TSPC_SM_2_4 is supported,
>  	otherwise Excluded
>  ---------------------------------------------------------------------------
> ----
> 
> @@ -85,7 +90,7 @@ TSPC_SM_7_1	True		Encryption Key (C.1)
>  TSPC_SM_7_2	True		Identity Key (C.2)
>  TSPC_SM_7_3	True		Signing Key (C.3)
>  ---------------------------------------------------------------------------
> ---- -C.1: Mandatory if GAP (24/2 OR 42/6) is supported, ELSE Optional
> -C.2: Mandatory if GAP (26/3) is supported, ELSE Optional
> -C.3: Mandatory if GAP (25/6 OR 35/6) is supported, ELSE Optional
> +C.1: Mandatory if TSPC_GAP_24_2 OR TSPC_GAP_42_6 is supported, ELSE
> Optional +C.2: Mandatory if TSPC_GAP_26_3 is supported, ELSE Optional
> +C.3: Mandatory if TSPC_GAP_25_6 OR TSPC_GAP_35_6 is supported, ELSE
> Optional
> ---------------------------------------------------------------------------
> ---- diff --git a/android/pixit-sm.txt b/android/pixit-sm.txt
> index 98e2ab5..6facbb8 100644
> --- a/android/pixit-sm.txt
> +++ b/android/pixit-sm.txt
> @@ -1,6 +1,6 @@
>  SM PIXIT for the PTS tool.
> 
> -PTS version: 6.0
> +PTS version: 6.1
> 
>  * - different than PTS defaults
>  & - should be set to IUT Bluetooth address
> diff --git a/android/pts-sm.txt b/android/pts-sm.txt
> index 91737cc..1fad305 100644
> --- a/android/pts-sm.txt
> +++ b/android/pts-sm.txt
> @@ -1,9 +1,9 @@
>  PTS test results for SM
> 
> -PTS version: 6.0
> -Tested: 11-February-2015
> -Android version: 5.0
> -kernel version: 3.20
> +PTS version: 6.1
> +Tested: 04-May-2015
> +Android version: 5.1
> +kernel version: 4.1
> 
>  Results:
>  PASS	test passed
> @@ -24,12 +24,7 @@ TC_JW_BV_02_C		PASS	btmgmt advertising on
>  TC_JW_BV_05_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
>  TC_JW_BI_01_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
>  TC_JW_BI_02_C		PASS	btmgmt pairable on
> -TC_JW_BI_03_C		PASS	bluetoothd is NOT running
> -				btmgmt power on
> -				btmgmt le on
> -				btmgmt connectable on
> -				btmgmt pairable on
> -				btmgmt discov on
> +TC_JW_BI_03_C		PASS	btmgmt pairable on
>  				btmgmt advertising on
>  TC_JW_BI_04_C		PASS	btmgmt pairable off
>  				btmgmg pair -c 0x03 -t 0x01 <addr>
> @@ -38,8 +33,6 @@ TC_PKE_BV_01_C		PASS	btmgmt pairable off
>  				Note: provide passkey to PTS
>  TC_PKE_BV_02_C		PASS	btmgmt pairable off
>  				btmgmt io-cap 0x04
> -				btmgmt advertising on
> -				btmgmt monitor
>  				Note: provide passkey
>  TC_PKE_BV_04_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
>  TC_PKE_BV_05_C		PASS	btmgmt io-cap 0x04
> @@ -50,7 +43,6 @@ TC_PKE_BI_02_C		PASS	btmgmt pair -c 0x04 -t 0x01 
<addr>
>  				Note: provide passkey
>  TC_PKE_BI_03_C		PASS	btmgmt io-cap 0x04
>  				btmgmt advertising on
> -				btmgmt monitor
>  				Note: Enter invalid passkey in PTS
>  TC_OOB_BV_01_C		N/A
>  TC_OOB_BV_02_C		N/A
> @@ -59,12 +51,10 @@ TC_OOB_BV_04_C		N/A
>  TC_OOB_BV_05_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
>  				Note: Enter valid passkey in PTS
>  TC_OOB_BV_06_C		PASS	btmgmt advertising on
> -				btmgmt monitor
>  				Note: Enter valid passkey in PTS
>  TC_OOB_BV_07_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
>  TC_OOB_BV_08_C		PASS	btmgmt advertising on
> -				btmgmt monitor
> -				Note: Accept pairing in btmgmt monitor
> +				Note: Accept pairing in btmgmt
>  TC_OOB_BV_09_C		N/A
>  TC_OOB_BV_10_C		N/A
>  TC_OOB_BI_01_C		N/A
> @@ -72,10 +62,8 @@ TC_OOB_BI_02_C		N/A
>  TC_EKS_BV_01_C		PASS	btmgmt pair -c 0x04 -t 0x01 <addr>
>  				Note: Enter valid passkey in PTS
>  TC_EKS_BV_02_C		PASS	btmgmt advertising on
> -				btmgmt monitor
> -				Note: Accept pairing in btmgmt monitor
> -TC_EKS_BI_01_C		PASS	btmgmt io-cap 0x03
> -				btmgmt pair -c 0x03 -t 0x01 <addr>
> +				Note: Accept pairing in btmgmt
> +TC_EKS_BI_01_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
>  TC_EKS_BI_02_C		PASS	btmgmt advertising on
>  TC_SIGN_BV_01_C		INC	PTS issue #12305
>  TC_SIGN_BV_03_C		PASS	haltest:
> @@ -108,9 +96,7 @@ TC_KDU_BV_05_C		PASS	PTS issue #12302
>  TC_KDU_BV_06_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
>  TC_KDU_BV_07_C		PASS	btmgmt pairable on
>  TC_SIP_BV_01_C		PASS	btmgmt advertising on
> -				btmgmt pair -c 0x03 -t 0x01 <addr>
> -TC_SIP_BV_02_C		PASS	btmgmt advertising off
> -				l2test -n -J4 -V le_public <addr>
> -TC_SIE_BV_01_C		PASS	btmgmt advertising on
> -				btmgmt pair -c 0x03 -t 0x01 <addr>
> +TC_SIP_BV_02_C		PASS	btmgmt pair -c 0x03 -t 0x01 <addr>
> +TC_SIE_BV_01_C		PASS	btmgmt io-cap 0x03
> +				btmgmt advertising on
>  ---------------------------------------------------------------------------
> ----

Applied, thanks.

-- 
BR
Szymon Janc

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCHv3] android/hidhost: Fix connecting HOGP over BREDR
  2015-05-20  9:56     ` [PATCHv3] android/hidhost: Fix connecting HOGP over BREDR Mariusz Skamra
@ 2015-05-22 13:17       ` Szymon Janc
  0 siblings, 0 replies; 7+ messages in thread
From: Szymon Janc @ 2015-05-22 13:17 UTC (permalink / raw)
  To: Mariusz Skamra; +Cc: linux-bluetooth

Hi Mariusz,

On Wednesday 20 of May 2015 11:56:39 Mariusz Skamra wrote:
> This patch fixes issue related to HID connection over BREDR.
> To avoid HOG connection with dual mode device connected over
> BREDR, bearer type is checked not the features of remote device.
> ---
>  android/hidhost.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/android/hidhost.c b/android/hidhost.c
> index 729b884..a2b820f 100644
> --- a/android/hidhost.c
> +++ b/android/hidhost.c
> @@ -891,7 +891,7 @@ static void bt_hid_connect(const void *buf, uint16_t
> len) ba2str(&dev->dst, addr);
>  	DBG("connecting to %s", addr);
> 
> -	if (bt_is_device_le(&dst)) {
> +	if (bt_device_last_seen_bearer(&dev->dst) != BDADDR_BREDR) {
>  		if (!hog_connect(dev)) {
>  			status = HAL_STATUS_FAILED;
>  			hid_device_remove(dev);

Patch applied, thanks.

-- 
BR
Szymon Janc

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-05-22 13:17 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-19  8:25 [PATCH] android/hidhost: Fix connecting HOGP over BREDR Mariusz Skamra
2015-05-19  8:56 ` [PATCHv2] " Mariusz Skamra
2015-05-19 14:09   ` Szymon Janc
2015-05-20  9:55     ` [PATCHv2] android/pts: Update SM test results Mariusz Skamra
2015-05-22 13:13       ` Szymon Janc
2015-05-20  9:56     ` [PATCHv3] android/hidhost: Fix connecting HOGP over BREDR Mariusz Skamra
2015-05-22 13:17       ` Szymon Janc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).