Patrick Steinhardt 339ddaa626 Bluetooth: Fix update of connection state in hci_encrypt_cfm ... Starting with the upgrade to v5.8-rc3, I've noticed I wasn't able to connect to my Bluetooth headset properly anymore. While connecting to the device would eventually succeed, bluetoothd seemed to be confused about the current connection state where the state was flapping hence and forth. Bisecting this issue led to commit 3ca44c16b0 (Bluetooth: Consolidate encryption handling in hci_encrypt_cfm, 2020-05-19), which refactored `hci_encrypt_cfm` to also handle updating the connection state. The commit in question changed the code to call `hci_connect_cfm` inside `hci_encrypt_cfm` and to change the connection state. But with the conversion, we now only update the connection state if a status was set already. In fact, the reverse should be true: the status should be updated if no status is yet set. So let's fix the isuse by reversing the condition. Fixes: 3ca44c16b0 ("Bluetooth: Consolidate encryption handling in hci_encrypt_cfm") Signed-off-by: Patrick Steinhardt <ps@pks.im> Acked-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>		2020-07-16 08:40:07 +02:00
..
acpi	Additional ACPI updates for 5.7-rc1	2020-04-06 10:35:06 -07:00
asm-generic	include/asm-generic/topology.h: guard cpumask_of_node() macro argument	2020-05-28 11:35:41 -07:00
clocksource
crypto	crypto: curve25519 - do not pollute dispatcher based on assembler	2020-04-09 00:01:59 +09:00
drm	drm: fix trivial field description cut-and-paste error	2020-05-11 10:48:53 -07:00
dt-bindings	RISC-V Patches for the 5.7 Merge Window, Part 1	2020-04-09 10:51:30 -07:00
keys
kunit
kvm
linux	bpf: Fix up bpf_skb_adjust_room helper's skb csum setting	2020-06-02 11:50:23 -07:00
math-emu
media
misc
net	Bluetooth: Fix update of connection state in hci_encrypt_cfm	2020-07-16 08:40:07 +02:00
pcmcia
ras
rdma	RDMA/core: Fix double destruction of uobject	2020-05-27 14:22:57 -03:00
scsi
soc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-06 22:10:13 -07:00
sound	ALSA: rawmidi: Fix racy buffer resize under concurrent accesses	2020-05-07 22:29:14 +02:00
target
trace	net_sched: add a tracepoint for qdisc creation	2020-05-27 15:05:49 -07:00
uapi	bpf: Add csum_level helper for fixing up csum levels	2020-06-02 11:50:23 -07:00
vdso	vdso/datapage: Use correct clock mode name in comment	2020-04-20 19:19:52 +02:00
video
xen	xen: Use evtchn_type_t as a type for event channels	2020-04-07 12:12:54 +02:00