Commit 3769972b authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Add a new HCI_USE_DEBUG_KEYS flag 



To pave the way for actively using debug keys for pairing this patch
adds a new HCI_USE_DEBUG_KEYS flag for the purpose. When the flag is set
we issue a HCI_Write_SSP_Debug mode whenever HCI_Write_SSP_Mode(0x01)
has been issued as well as before issuing a HCI_Write_SSP_Mode(0x00)
command.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 58e9293c

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ enum { 
	HCI_PAIRABLE,

	HCI_SERVICE_CACHE,

	HCI_KEEP_DEBUG_KEYS,

	HCI_USE_DEBUG_KEYS,

	HCI_UNREGISTER,

	HCI_USER_CHANNEL,

net/bluetooth/mgmt.c

+10 −2
Original line number Diff line number Diff line
@@ -1877,6 +1877,10 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 
		goto failed;

	}



	if (!cp->val && test_bit(HCI_USE_DEBUG_KEYS, &hdev->dev_flags))

		hci_send_cmd(hdev, HCI_OP_WRITE_SSP_DEBUG_MODE,

			     sizeof(cp->val), &cp->val);



	err = hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &cp->val);

	if (err < 0) {

		mgmt_pending_remove(cmd);
@@ -5784,10 +5788,14 @@ void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status) 


	hci_req_init(&req, hdev);



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

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

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

			hci_req_add(&req, HCI_OP_WRITE_SSP_DEBUG_MODE,

				    sizeof(enable), &enable);

		update_eir(&req);

	else

	} else {

		clear_eir(&req);

	}



	hci_req_run(&req, NULL);

}