From: Szymon Janc <szymon.janc@tieto.com>
Date: Tue, 22 Mar 2011 12:12:23 +0000 (+0100)
Subject: Bluetooth: Enable support for out of band association model
X-Git-Tag: MMI-PSA29.97-13-9~19291^2~16^2~94^2~82
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce85ee13e6b5d078f4a6c3b02ba7cd0fa140c552;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Bluetooth: Enable support for out of band association model

If remote side reports oob availability or we are pairing initiator
use oob data for pairing if available.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e0aaf3053667..da4c662dbc30 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2371,9 +2371,14 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff
 
 		bacpy(&cp.bdaddr, &ev->bdaddr);
 		cp.capability = conn->io_capability;
-		cp.oob_data = 0;
 		cp.authentication = hci_get_auth_req(conn);
 
+		if ((conn->out == 0x01 || conn->remote_oob == 0x01) &&
+				hci_find_remote_oob_data(hdev, &conn->dst))
+			cp.oob_data = 0x01;
+		else
+			cp.oob_data = 0x00;
+
 		hci_send_cmd(hdev, HCI_OP_IO_CAPABILITY_REPLY,
 							sizeof(cp), &cp);
 	} else {