Re: [PATCH-stable] Bluetooth: hci_conn: Fix hci_connect_le_sync

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

Hello Luiz,

On 24.05.22 20:08, Luiz Augusto von Dentz wrote:
> On Tue, May 24, 2022 at 8:55 AM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
>> On 24.05.22 16:48, Ahmad Fatoum wrote:
>> I see now that this fix doesn't build for v5.17 because hci_conn_failed
>> was only introduced in v5.18. Can the hci_conn.c hunk be safely dropped?
> 
> Are you talking about:
> 
>         if (status) {
> -               hci_le_conn_failed(conn, status);
> +               hci_conn_failed(conn, status);
>                 goto unlock;
>         }
> 
> You just need to replace hci_conn_failed with hci_le_conn_failed or
> well in the code above the end result is the same since it is not
> supposed to cleanup in the event handler.

Yes, that cleanup in le_conn_complete_evt() needs to be removed.
I am talking about the other hunk in hci_conn.c:

  -    if (!conn)
  +    /* Check if connection is still pending */
  +    if (conn != hci_lookup_le_connect(hdev))
               goto done;
 
   -    hci_le_conn_failed(conn, err);
   +    hci_conn_failed(conn, err);
 
    done:
        hci_dev_unlock(hdev);


Can this be dropped for v5.17?

Cheers,
Ahmad

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |