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 910f608365f7ac67e4ad3e4fb8e5dafae7b4b32e..61bd1a8c5849bdc07b345a6ce9b71dce79d9a3ad 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 --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ff874580d989410b7eac9254dcfcbf6ba1e7a570..eb25a1259271968b03282a0f91deb3b507ed68f7 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2264,7 +2264,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 
        if (val) {
                hci_cp.le = val;
-               hci_cp.simul = lmp_le_br_capable(hdev);
+               hci_cp.simul = 0x00;
        } else {
                if (test_bit(HCI_LE_ADV, &hdev->dev_flags))
                        disable_advertising(&req);
@@ -5925,8 +5925,8 @@ static int powered_update_hci(struct hci_dev *hdev)
            lmp_bredr_capable(hdev)) {
                struct hci_cp_write_le_host_supported cp;
 
-               cp.le = 1;
-               cp.simul = lmp_le_br_capable(hdev);
+               cp.le = 0x01;
+               cp.simul = 0x00;
 
                /* Check first if we already have the right
                 * host state (host features set)