Peter Hurley b7d05bad1c 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>		2012-02-13 17:01:31 +02:00
..
bnep	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-03 15:16:34 -05:00
cmtp	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
hidp	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
rfcomm	Bluetooth: Fix RFCOMM session reference counting issue	2012-02-13 17:01:31 +02:00
af_bluetooth.c	Bluetooth: silence lockdep warning	2012-02-13 17:01:29 +02:00
hci_conn.c	Bluetooth: Fix l2cap conn failures for ssp devices	2012-02-13 17:01:31 +02:00
hci_core.c	Bluetooth: Use GFP_KERNEL in hci_add_adv_entry()	2012-02-13 17:01:31 +02:00
hci_event.c	Bluetooth: Add a convenience function to check for SSP enabled	2012-02-13 17:01:29 +02:00
hci_sock.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2012-01-10 15:44:17 -05:00
hci_sysfs.c	Bluetooth: Correctly acquire module ref	2012-02-13 17:01:24 +02:00
Kconfig	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
l2cap_core.c	Bluetooth: Fix possible use after free in delete path	2012-02-13 17:01:30 +02:00
l2cap_sock.c	Bluetooth: Add alloc_skb chan operator	2012-02-13 17:01:29 +02:00
lib.c	Bluetooth: Add bt_printk	2011-06-30 19:17:12 -03:00
Makefile	Bluetooth: Always compile SCO and L2CAP in Bluetooth Core	2011-12-21 02:21:08 -02:00
mgmt.c	Bluetooth: Convert hdev->ssp_mode to a flag	2012-02-13 17:01:29 +02:00
sco.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2012-01-10 15:44:17 -05:00
smp.c	Bluetooth: Fix invalid memory access when there's no SMP channel	2012-02-13 17:01:31 +02:00