| Message ID | 20220513235125.1364692-3-luiz.dentz@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/3] Bluetooth: Add bt_status | expand |
Hi Luiz, > The handling of connection failures shall be handled by the request > completion callback as already done by hci_cs_le_create_conn, also make > sure to use hci_conn_failed instead of hci_le_conn_failed as the later > don't actually call hci_conn_del to cleanup. > > Fixes: 8e8b92ee60de5 ("Bluetooth: hci_sync: Add hci_le_create_conn_sync") > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > --- > net/bluetooth/hci_conn.c | 5 +++-- > net/bluetooth/hci_event.c | 8 +++++--- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c > index 4a5193499b77..a36297368c58 100644 > --- a/net/bluetooth/hci_conn.c > +++ b/net/bluetooth/hci_conn.c > @@ -943,10 +943,11 @@ static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) > > bt_dev_err(hdev, "request failed to create LE connection: err %d", err); > > - if (!conn) > + /* Check if connection is still pending */ > + if (conn != hci_lookup_le_connect(hdev)) > goto done; > > - hci_le_conn_failed(conn, bt_status(err)); > + hci_conn_failed(conn, bt_status(err)); > > done: > hci_dev_unlock(hdev); > 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; can apply this patch alone and push it to -stable? Regards Marcel
Hi Marcel, On Thu, May 19, 2022 at 11:08 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Luiz, > > > The handling of connection failures shall be handled by the request > > completion callback as already done by hci_cs_le_create_conn, also make > > sure to use hci_conn_failed instead of hci_le_conn_failed as the later > > don't actually call hci_conn_del to cleanup. > > > > Fixes: 8e8b92ee60de5 ("Bluetooth: hci_sync: Add hci_le_create_conn_sync") > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > --- > > net/bluetooth/hci_conn.c | 5 +++-- > > net/bluetooth/hci_event.c | 8 +++++--- > > 2 files changed, 8 insertions(+), 5 deletions(-) > > > > diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c > > index 4a5193499b77..a36297368c58 100644 > > --- a/net/bluetooth/hci_conn.c > > +++ b/net/bluetooth/hci_conn.c > > @@ -943,10 +943,11 @@ static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) > > > > bt_dev_err(hdev, "request failed to create LE connection: err %d", err); > > > > - if (!conn) > > + /* Check if connection is still pending */ > > + if (conn != hci_lookup_le_connect(hdev)) > > goto done; > > > > - hci_le_conn_failed(conn, bt_status(err)); > > + hci_conn_failed(conn, bt_status(err)); > > > > done: > > hci_dev_unlock(hdev); > > 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; > > can apply this patch alone and push it to -stable? Sure, but note that it is using bt_status so perhaps I can rebase it to stop using bt_status first? > Regards > > Marcel >
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 4a5193499b77..a36297368c58 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -943,10 +943,11 @@ static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) bt_dev_err(hdev, "request failed to create LE connection: err %d", err); - if (!conn) + /* Check if connection is still pending */ + if (conn != hci_lookup_le_connect(hdev)) goto done; - hci_le_conn_failed(conn, bt_status(err)); + hci_conn_failed(conn, bt_status(err)); done: hci_dev_unlock(hdev); 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;