---

yaml --- r: 314429 b: refs/heads/master c: 6d3c730 h: refs/heads/master i: 314427: d377d27 v: v3
git-mirror · Jun 5, 2012 · cd7f831 · cd7f831
1 parent 79330f8
commit cd7f831
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37ed561e823f5f91ca87522d61a57974be583c0d
+refs/heads/master: 6d3c730f03e0d1aed2125c1a64ad8857c63f5163
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/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,