diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-05-24 06:19:17 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-24 06:19:17 +0200 |
| commit | 677fb7525331375ba2f90f4bc94a80b9b6e697a3 (patch) | |
| tree | d7b9574e487930977c240c5503a3103e32e41cec /net/bluetooth/hci_event.c | |
| parent | Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff) | |
| parent | Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-677fb7525331375ba2f90f4bc94a80b9b6e697a3.tar.xz linux-677fb7525331375ba2f90f4bc94a80b9b6e697a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/cadence/macb_main.c
5cebb40bc955 ("net: macb: Fix PTP one step sync support")
138badbc21a0 ("net: macb: use NAPI for TX completion path")
https://lore.kernel.org/all/20220523111021.31489367@canb.auug.org.au/
net/smc/af_smc.c
75c1edf23b95 ("net/smc: postpone sk_refcnt increment in connect()")
3aba103006bc ("net/smc: align the connect behaviour with TCP")
https://lore.kernel.org/all/20220524114408.4bf1af38@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0270e597c285..af17dfb20e01 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5632,10 +5632,12 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, status = HCI_ERROR_INVALID_PARAMETERS; } - if (status) { - hci_conn_failed(conn, status); + /* All connection failure handling is taken care of by the + * hci_conn_failed function which is triggered by the HCI + * request completion callbacks used for connecting. + */ + if (status) goto unlock; - } if (conn->dst_type == ADDR_LE_DEV_PUBLIC) addr_type = BDADDR_LE_PUBLIC; |