* [PATCHv2 1/2] Bluetooth: Correct version check in hci_setup
@ 2011-11-24 12:36 Emeltchenko Andrei
2011-11-24 12:36 ` [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers Emeltchenko Andrei
0 siblings, 1 reply; 5+ messages in thread
From: Emeltchenko Andrei @ 2011-11-24 12:36 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Check for hci_ver instead of lmp_ver
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers
2011-11-24 12:36 [PATCHv2 1/2] Bluetooth: Correct version check in hci_setup Emeltchenko Andrei
@ 2011-11-24 12:36 ` Emeltchenko Andrei
2011-11-25 12:03 ` Marcel Holtmann
0 siblings, 1 reply; 5+ messages in thread
From: Emeltchenko Andrei @ 2011-11-24 12:36 UTC (permalink / raw)
To: linux-bluetooth
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>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
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..97264fc 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 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..60651fa 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) {
struct hci_cp_change_conn_ptype cp;
cp.handle = ev->handle;
cp.pkt_type = cpu_to_le16(conn->pkt_type);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers
2011-11-24 12:36 ` [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers Emeltchenko Andrei
@ 2011-11-25 12:03 ` Marcel Holtmann
2011-11-25 19:53 ` Andrei Emeltchenko
0 siblings, 1 reply; 5+ messages in thread
From: Marcel Holtmann @ 2011-11-25 12:03 UTC (permalink / raw)
To: Emeltchenko Andrei; +Cc: linux-bluetooth
Hi Andrei,
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> Acked-by: Marcel Holtmann <marcel@holtmann.org>
> ---
> 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..97264fc 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 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..60651fa 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;
maybe in an extra patch we change this to < BLUETOOTH_VER_1_2 to match
it exactly what the comment says about pre 1.2.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers
2011-11-25 12:03 ` Marcel Holtmann
@ 2011-11-25 19:53 ` Andrei Emeltchenko
2011-11-28 16:09 ` Marcel Holtmann
0 siblings, 1 reply; 5+ messages in thread
From: Andrei Emeltchenko @ 2011-11-25 19:53 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
-----
> Hi Andrei,
>
> > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > Acked-by: Marcel Holtmann <marcel@holtmann.org>
> > ---
> > 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..97264fc 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 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..60651fa 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;
>
> maybe in an extra patch we change this to < BLUETOOTH_VER_1_2 to match
> it exactly what the comment says about pre 1.2.
Do you want it to be a separate patch?
-- Regards, Andrei
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers
2011-11-25 19:53 ` Andrei Emeltchenko
@ 2011-11-28 16:09 ` Marcel Holtmann
0 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2011-11-28 16:09 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
> > > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > > Acked-by: Marcel Holtmann <marcel@holtmann.org>
> > > ---
> > > 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..97264fc 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 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..60651fa 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;
> >
> > maybe in an extra patch we change this to < BLUETOOTH_VER_1_2 to match
> > it exactly what the comment says about pre 1.2.
>
> Do you want it to be a separate patch?
sure. Just add another patch on top of your stack.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-28 16:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-24 12:36 [PATCHv2 1/2] Bluetooth: Correct version check in hci_setup Emeltchenko Andrei
2011-11-24 12:36 ` [PATCHv2 2/2] Bluetooth: Remove magic bluetooth version numbers Emeltchenko Andrei
2011-11-25 12:03 ` Marcel Holtmann
2011-11-25 19:53 ` Andrei Emeltchenko
2011-11-28 16:09 ` Marcel Holtmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.