From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Thu, 24 May 2012 06:36:37 +0000 (-0300)
Subject: Bluetooth: Use lmp_ssp_capable() macro
X-Git-Tag: next-20120724~64^2~108
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d3c730f03e0d1aed2125c1a64ad8857c63f5163;p=karo-tx-linux.git

Bluetooth: Use lmp_ssp_capable() macro

Make the check more user friendly.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5e24a57a4613..80f209b01b9e 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -557,7 +557,7 @@ static void hci_setup(struct hci_dev *hdev)
 	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) {
+	if (lmp_ssp_capable(hdev)) {
 		if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
 			u8 mode = 0x01;
 			hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE,