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 910f608..61bd1a8 100644 (file)
--- 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))

diff --cc net/bluetooth/mgmt.c
Simple merge