From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 24 Jul 2014 18:04:16 +0000 (+0200)
Subject: Bluetooth: Set Simultaneous LE and BR/EDR controller option to zero
X-Git-Tag: cleanup-for-v3.18~108^2~12^2~41^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32226e4f1af2b58983676b577ce33403c08e6c94;p=pandora-kernel.git

Bluetooth: Set Simultaneous LE and BR/EDR controller option to zero

With the Bluetooth 4.1 specification the Simultaneous LE and BR/EDR
controller option has been deprecated. It shall be set to zero and
ignored otherwise.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 910f608365f7..61bd1a8c5849 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1623,7 +1623,7 @@ static void hci_set_le_support(struct hci_request *req)
 
 	if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
 		cp.le = 0x01;
-		cp.simul = lmp_le_br_capable(hdev);
+		cp.simul = 0x00;
 	}
 
 	if (cp.le != lmp_host_le_capable(hdev))
Reading git-diff-tree failed