On Fri, Jun 08, 2012 at 11:53:17AM +0300, Andrei Emeltchenko wrote:
> Hi Marcel,
>
> On Fri, Jun 08, 2012 at 05:31:56PM +0900, Marcel Holtmann wrote:
> > Hi Andrei,
> >
> > > Remove magic and use standard HCI cmd timeout
> > >
> > > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
> > > ---
> > > net/bluetooth/hci_core.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
> >
> > > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> > > index a2e15436c..e5a9a09 100644
> > > --- a/net/bluetooth/hci_core.c
> > > +++ b/net/bluetooth/hci_core.c
> > > @@ -783,7 +783,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
> > > test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
> > > set_bit(HCI_INIT, &hdev->flags);
> > > __hci_request(hdev, hci_reset_req, 0,
> > > - msecs_to_jiffies(250));
> > > + msecs_to_jiffies(HCI_CMD_TIMEOUT));
> > > clear_bit(HCI_INIT, &hdev->flags);
> > > }
> >
> > And while you are at it, can we please move over to put the
> > msecs_to_jiffies into the #define itself.
>
> Do you mean convert those defines below?
>
> /* HCI timeouts */
> #define HCI_DISCONN_TIMEOUT (2000) /* 2 seconds */
> #define HCI_PAIRING_TIMEOUT (60000) /* 60 seconds */
> #define HCI_INIT_TIMEOUT (10000) /* 10 seconds */
> #define HCI_CMD_TIMEOUT (1000) /* 1 seconds */
> #define HCI_ACL_TX_TIMEOUT (45000) /* 45 seconds */
I think I will convert them in the following patch.
Best regards
Andrei Emeltchenko
--
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
