summaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth
diff options
context:
space:
mode:
authorHemant Gupta <hemant.gupta@stericsson.com>2012-03-28 13:39:09 +0200
committerGustavo Padovan <gustavo@padovan.org>2012-03-28 17:02:19 +0200
commit3f17790c2d8524c3ddc4946bd716714becf079e1 (patch)
treeef1e5d5ff2cb57c7b9f7900f695a9d8d9b26a740 /include/net/bluetooth
parentMAINTAINERS: update Bluetooth tree locations (diff)
downloadlinux-3f17790c2d8524c3ddc4946bd716714becf079e1.tar.xz
linux-3f17790c2d8524c3ddc4946bd716714becf079e1.zip
Bluetooth: 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 <hemant.gupta@stericsson.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r--include/net/bluetooth/hci_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index daefaac51131..8e103281a09b 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -427,7 +427,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));
}