summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2012-01-13 15:11:30 +0100
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 17:01:31 +0200
commitb7d05bad1c10a363b6b99f66ac1fa76b6892e618 (patch)
treef91706b1946c634cab519f9868e529cec289be8d /include/linux
parent9ef866adf9602238c2e83e951a72a1037d4179de (diff)
Bluetooth: Fix l2cap conn failures for ssp devices
Commit 330605423c fixed l2cap conn establishment for non-ssp remote devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security is tested (which was always returning failure on any subsequent security checks). However, this broke l2cap conn establishment for ssp remote devices when an ACL link was already established at SDP-level security. This fix ensures that encryption must be pending whenever authentication is also pending. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Tested-by: Daniel Wagner <daniel.wagner@bmw-carit.de> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions