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

Commit 6b4b73ee authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix sending unnecessary HCI_Write_SSP_Mode command 



This patch fixes sending an unnecessary HCI_Write_SSP_Mode command if
the command has already been sent as part of the default HCI init
sequence.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 5ed8eb2f

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 
#define lmp_ext_feat_capable(dev)  ((dev)->features[7] & LMP_EXTFEATURES)



/* ----- Extended LMP capabilities ----- */

#define lmp_host_ssp_capable(dev)  ((dev)->host_features[0] & LMP_HOST_SSP)

#define lmp_host_le_capable(dev)   ((dev)->host_features[0] & LMP_HOST_LE)

#define lmp_host_le_br_capable(dev) ((dev)->host_features[0] & LMP_HOST_LE_BREDR)

net/bluetooth/mgmt.c

+2 −1
Original line number Diff line number Diff line
@@ -2913,7 +2913,8 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered) 
	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);



	if (powered) {

		if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {

		if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&

		    !lmp_host_ssp_capable(hdev)) {

			u8 ssp = 1;



			hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &ssp);