[PATCH 1/2] Bluetooth: Correct version check in hci_setup

[PATCH 1/2] Bluetooth: Correct version check in hci_setup

[Emeltchenko Andrei]

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

Check for hci_ver instead of lmp_ver

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
 net/bluetooth/hci_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index dfe6fbc..7da7ef6 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -562,7 +562,7 @@ static void hci_setup(struct hci_dev *hdev)
 {
 	hci_setup_event_mask(hdev);
 
-	if (hdev->lmp_ver > 1)
+	if (hdev->hci_ver > 1)
 		hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);
 
 	if (hdev->features[6] & LMP_SIMPLE_PAIR) {
-- 
1.7.4.1

[PATCH 2/2] Bluetooth: Remove magic bluetooth version numbers

[Emeltchenko Andrei]

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

Use bluetooth names instead of BT SIG assigned numbers

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
 include/net/bluetooth/bluetooth.h |    5 +++++
 net/bluetooth/hci_conn.c          |    2 +-
 net/bluetooth/hci_event.c         |    6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 38cd3da..98ea1b1 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -36,6 +36,11 @@
 #define PF_BLUETOOTH	AF_BLUETOOTH
 #endif
 
+/* Bluetooth versions */
+#define BLUETOOTH_VER_1_1	1
+#define BLUETOOTH_VER_1_2	2
+#define BLUETOOTH_VER_2_0_EDR	3
+
 /* Reserv for core and drivers use */
 #define BT_SKB_RESERVE	8
 
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index de0b93e..b328ac6 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -123,7 +123,7 @@ static void hci_acl_connect_cancel(struct hci_conn *conn)
 
 	BT_DBG("%p", conn);
 
-	if (conn->hdev->hci_ver < 2)
+	if (conn->hdev->hci_ver < BLUETOOTH_VER_1_2)
 		return;
 
 	bacpy(&cp.bdaddr, &conn->dst);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 7da7ef6..7790108 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -498,7 +498,7 @@ static void hci_setup_event_mask(struct hci_dev *hdev)
 
 	/* CSR 1.1 dongles does not accept any bitfield so don't try to set
 	 * any event mask for pre 1.2 devices */
-	if (hdev->lmp_ver <= 1)
+	if (hdev->lmp_ver <= BLUETOOTH_VER_1_1)
 		return;
 
 	events[4] |= 0x01; /* Flow Specification Complete */
@@ -562,7 +562,7 @@ static void hci_setup(struct hci_dev *hdev)
 {
 	hci_setup_event_mask(hdev);
 
-	if (hdev->hci_ver > 1)
+	if (hdev->hci_ver > BLUETOOTH_VER_1_1)
 		hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);
 
 	if (hdev->features[6] & LMP_SIMPLE_PAIR) {
@@ -1499,7 +1499,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
 		}
 
 		/* Set packet type for incoming connection */
-		if (!conn->out && hdev->hci_ver < 3) {
+		if (!conn->out && hdev->hci_ver < BLUETOOTH_VER_2_0_EDR) {
 			struct hci_cp_change_conn_ptype cp;
 			cp.handle = ev->handle;
 			cp.pkt_type = cpu_to_le16(conn->pkt_type);
-- 
1.7.4.1

Re: [PATCH 2/2] Bluetooth: Remove magic bluetooth version numbers

[Marcel Holtmann]

Hi Andrei,

> Use bluetooth names instead of BT SIG assigned numbers
> 
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
>  include/net/bluetooth/bluetooth.h |    5 +++++
>  net/bluetooth/hci_conn.c          |    2 +-
>  net/bluetooth/hci_event.c         |    6 +++---
>  3 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
> index 38cd3da..98ea1b1 100644
> --- a/include/net/bluetooth/bluetooth.h
> +++ b/include/net/bluetooth/bluetooth.h
> @@ -36,6 +36,11 @@
>  #define PF_BLUETOOTH	AF_BLUETOOTH
>  #endif
>  
> +/* Bluetooth versions */
> +#define BLUETOOTH_VER_1_1	1
> +#define BLUETOOTH_VER_1_2	2
> +#define BLUETOOTH_VER_2_0_EDR	3
> +

I am fine with the patch, but you need to use BLUETOOTH_VER_2_0 here
since you have have 2.0 without EDR. Have a fun night reading with the
Bluetooth SIG branding guidelines.

Once you did that change, ACK.

Regards

Marcel

Re: [PATCH 2/2] Bluetooth: Remove magic bluetooth version numbers

[Emeltchenko Andrei]

Hi Marcel,

On Wed, Nov 23, 2011 at 03:48:58PM +0100, Marcel Holtmann wrote:
> > +/* Bluetooth versions */
> > +#define BLUETOOTH_VER_1_1	1
> > +#define BLUETOOTH_VER_1_2	2
> > +#define BLUETOOTH_VER_2_0_EDR	3
> > +
> 
> I am fine with the patch, but you need to use BLUETOOTH_VER_2_0 here
> since you have have 2.0 without EDR. Have a fun night reading with the
> Bluetooth SIG branding guidelines.

OK, I will remove EDR at the end. BTW: on a bluetooth web site there seems
to be different interpretation of those numbers:

Parameter Name 	Assigned Values
HCI_Version 	
        0 	Bluetooth Core Specification 1.0b
  	1 	Bluetooth Core Specification 1.1
  	2 	Bluetooth Core Specification 1.2
  	3 	Bluetooth Core Specification 2.0 + EDR
  	4 	Bluetooth Core Specification 2.1 + EDR
  	5 	Bluetooth Core Specification 3.0 + HS
  	6 	Bluetooth Core Specification 4.0
  	7 - 255 	Reserved

Source:
https://www.bluetooth.org/technical/assignednumbers/hci.htm

Best regards 
Andrei Emeltchenko 

> 
> Once you did that change, ACK.
> 
> Regards
> 
> Marcel
> 
> 

Re: [PATCH 2/2] Bluetooth: Remove magic bluetooth version numbers

[Marcel Holtmann]

Hi Andrei,

> > > +/* Bluetooth versions */
> > > +#define BLUETOOTH_VER_1_1	1
> > > +#define BLUETOOTH_VER_1_2	2
> > > +#define BLUETOOTH_VER_2_0_EDR	3
> > > +
> > 
> > I am fine with the patch, but you need to use BLUETOOTH_VER_2_0 here
> > since you have have 2.0 without EDR. Have a fun night reading with the
> > Bluetooth SIG branding guidelines.
> 
> OK, I will remove EDR at the end. BTW: on a bluetooth web site there seems
> to be different interpretation of those numbers:
> 
> Parameter Name 	Assigned Values
> HCI_Version 	
>         0 	Bluetooth Core Specification 1.0b
>   	1 	Bluetooth Core Specification 1.1
>   	2 	Bluetooth Core Specification 1.2
>   	3 	Bluetooth Core Specification 2.0 + EDR
>   	4 	Bluetooth Core Specification 2.1 + EDR
>   	5 	Bluetooth Core Specification 3.0 + HS
>   	6 	Bluetooth Core Specification 4.0
>   	7 - 255 	Reserved

they are actually wrong. The + XXX suffix is described in the Bluetooth
branding guidelines.

For example you can only call your product 3.0 + HS if you have a 2.1 or
3.0 controller (yes 2.1 is fine as well) with an AMP controller and
support for High Speed.

So the + XXX is pure product branding and has nothing to do with HCI or
LMP versions.

Regards

Marcel

Re: [PATCH 1/2] Bluetooth: Correct version check in hci_setup

[Marcel Holtmann]

Hi Andrei,

> Check for hci_ver instead of lmp_ver
> 
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
>  net/bluetooth/hci_event.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Marcel Holtmann <marcel@holtmann.org>

Regards

Marcel

Re: [PATCH 1/2] Bluetooth: Correct version check in hci_setup

[Gustavo Padovan]

Hi Andrei,

* Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com> [2011-11-23 11:23:34 +0200]:

> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> 
> Check for hci_ver instead of lmp_ver
> 
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
>  net/bluetooth/hci_event.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied to the bluetooth current tree. Thanks.

	Gustavo