diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-04-28 11:28:54 -0700 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-28 16:02:30 -0300 |
| commit | 9f61656a60c9506e3e4cd41af5efbcf6a30ee3b9 (patch) | |
| tree | bfeb4576c064f441c0262548165fa5ba9f19b032 /net/bluetooth/hci_event.c | |
| parent | 7a828908a026d801c6192fd32cfb35d6843f1539 (diff) | |
| download | kernel_samsung_smdk4412-9f61656a60c9506e3e4cd41af5efbcf6a30ee3b9.zip kernel_samsung_smdk4412-9f61656a60c9506e3e4cd41af5efbcf6a30ee3b9.tar.gz kernel_samsung_smdk4412-9f61656a60c9506e3e4cd41af5efbcf6a30ee3b9.tar.bz2 | |
Bluetooth: Add variable SSP auto-accept delay support
Some test systems require an arbitrary delay to the auto-accept test
cases for Secure Simple Pairing in order for the tests to pass.
Previously when this was handled in user space it was worked around by
code modifications and recompilation, but now that it's on the kernel
side it's more convenient if there's a debugfs interface for it.
Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 514e10e..a479389 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2515,7 +2515,15 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev, /* If no side requires MITM protection; auto-accept */ if ((!loc_mitm || conn->remote_cap == 0x03) && (!rem_mitm || conn->io_capability == 0x03)) { - BT_DBG("Auto-accept of user confirmation"); + BT_DBG("Auto-accept of user confirmation with %ums delay", + hdev->auto_accept_delay); + + if (hdev->auto_accept_delay > 0) { + int delay = msecs_to_jiffies(hdev->auto_accept_delay); + mod_timer(&conn->auto_accept_timer, jiffies + delay); + goto unlock; + } + hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_REPLY, sizeof(ev->bdaddr), &ev->bdaddr); goto unlock; |