From: h.sandeep <h.sandeep@samsung.com>
Date: Mon, 21 Nov 2016 11:14:42 +0000 (+0530)
Subject: Bluetooth: Fix IRK distribution issue when Privacy is disabled
X-Git-Tag: submit/tizen/20161205.013353~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F99002%2F5;p=platform%2Fkernel%2Flinux-exynos.git

Bluetooth: Fix IRK distribution issue when Privacy is disabled

The devices, like Android 6.x, which don't support privacy 1.2
couldn't make BLE connection to the device which doesn't distribute
IRK when pairing because they use use wrong address type.
For compatibility, it needs to distribute IRK even though Privacy
feature is disabled. So setting IRK interface is added and BlueZ
will set IRK if privacy feature is disabled. And when BLE pairing,
IRK will be always distributed.

Change-Id: I6dbcef9663a1a0cb2b7db89cad6e725025e41fa1
Signed-off-by: h.sandeep <h.sandeep@samsung.com>
---

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 1ab3dc9c8f99..1ad2643791f9 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -59,6 +59,11 @@
 /* Maximum message length that can be passed to aes_cmac */
 #define CMAC_MSG_MAX	80
 
+#ifdef TIZEN_BT
+#define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \
+		 "\x00\x00\x00\x00\x00\x00\x00\x00"
+#endif
+
 enum {
 	SMP_FLAG_TK_VALID,
 	SMP_FLAG_CFM_PENDING,
@@ -660,8 +665,13 @@ static void build_pairing_cmd(struct l2cap_conn *conn,
 	if (hci_dev_test_flag(hdev, HCI_RPA_RESOLVING))
 		remote_dist |= SMP_DIST_ID_KEY;
 
+#ifdef TIZEN_BT
+	if (memcmp(hdev->irk, ZERO_KEY, 16))
+		local_dist |= SMP_DIST_ID_KEY;
+#else
 	if (hci_dev_test_flag(hdev, HCI_PRIVACY))
 		local_dist |= SMP_DIST_ID_KEY;
+#endif
 
 	if (hci_dev_test_flag(hdev, HCI_SC_ENABLED) &&
 	    (authreq & SMP_AUTH_SC)) {