Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32226e4f authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 729a1051

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

net/bluetooth/mgmt.c

+3 −3
Original line number Diff line number Diff line
@@ -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)