Re: [PATCH 4/7] Bluetooth: Remove hci_cs_le_create_conn event handler

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Marcel,

On Wed, Oct 2, 2013 at 2:11 AM, Marcel Holtmann <marcel@xxxxxxxxxxxx> wrote:
>
> Hi Andre,
>
> > This patch removes the hci_cs_le_create_conn event handler since this
> > handling is now done in create_le_connection_complete() callback in
> > hci_conn.c.
> >
> > Signed-off-by: Andre Guedes <andre.guedes@xxxxxxxxxxxxx>
> > ---
> > net/bluetooth/hci_event.c | 31 -------------------------------
> > 1 file changed, 31 deletions(-)
> >
> > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> > index d171c04b..1d1ffa6 100644
> > --- a/net/bluetooth/hci_event.c
> > +++ b/net/bluetooth/hci_event.c
> > @@ -1465,33 +1465,6 @@ static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)
> >       hci_dev_unlock(hdev);
> > }
> >
> > -static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
> > -{
> > -     struct hci_conn *conn;
> > -
> > -     BT_DBG("%s status 0x%2.2x", hdev->name, status);
> > -
> > -     if (status) {
> > -             hci_dev_lock(hdev);
> > -
> > -             conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
> > -             if (!conn) {
> > -                     hci_dev_unlock(hdev);
> > -                     return;
> > -             }
> > -
> > -             BT_DBG("%s bdaddr %pMR conn %p", hdev->name, &conn->dst, conn);
> > -
> > -             conn->state = BT_CLOSED;
> > -             mgmt_connect_failed(hdev, &conn->dst, conn->type,
> > -                                 conn->dst_type, status);
> > -             hci_proto_connect_cfm(conn, status);
> > -             hci_conn_del(conn);
> > -
> > -             hci_dev_unlock(hdev);
> > -     }
> > -}
>
> this is dangerous since it actually breaks bisection. The code is never complete. So while this might turn into a larger patch, you might need to do it all 3 patches at once. With a length commit message explaining exactly what happens and why this is correct.

I failed to see how this breaks bisection since the handling is
already done in initiate_le_connection_complete(). However, as
commented in patch 2/7, I'll squash this into patch 2/7 as you
suggested.

Regards,

Andre
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux