2012-03-28 11:39:09

by Hemant Gupta

Subject: [PATCH] Use correct flags for checking HCI_SSP_ENABLED bit

This patch uses the correct flags for checking the HCI_SSP_ENABLED bit.
Without this authentication request was not being initiated.

Signed-off-by: Hemant Gupta <[email protected]>
---
include/net/bluetooth/hci_core.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index fa2c778..c8d5beb 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -431,7 +431,7 @@ enum {
static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
- return (test_bit(HCI_SSP_ENABLED, &hdev->flags) &&
+ return (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
test_bit(HCI_CONN_SSP_ENABLED, &conn->flags));
}

--
1.7.0.4

2012-03-28 12:00:39

by Johan Hedberg

Subject: Re: [PATCH] Use correct flags for checking HCI_SSP_ENABLED bit

Hi,

On Wed, Mar 28, 2012, Marcel Holtmann wrote:
> Hi Hemant,
>
> > This patch uses the correct flags for checking the HCI_SSP_ENABLED bit.
> > Without this authentication request was not being initiated.
> >
> > Signed-off-by: Hemant Gupta <[email protected]>
> > ---
> > include/net/bluetooth/hci_core.h | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
>
> Acked-by: Marcel Holtmann <[email protected]>

Applied to both bluetooth and bluetooth-next. Thanks.

Johan

2012-03-28 11:46:56

by Marcel Holtmann

Subject: Re: [PATCH] Use correct flags for checking HCI_SSP_ENABLED bit

Hi Hemant,

> This patch uses the correct flags for checking the HCI_SSP_ENABLED bit.
> Without this authentication request was not being initiated.
>
> Signed-off-by: Hemant Gupta <[email protected]>
> ---
> include/net/bluetooth/hci_core.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Marcel Holtmann <[email protected]>

Regards

Marcel