Hi Andre,
On 27 March 2014 19:46, Andre Guedes <andre.guedes@xxxxxxxxxxxxx> wrote:
> Hi Lukasz,
>
> On 03/27/2014 12:49 PM, Lukasz Rymanowski wrote:
>>
>> Keep msec instead of jiffies in this define. This is needed by folowing
>> patch where we want this timeout to be exposed in debugfs.
>>
>> Note: This default value comes from BT Spec. 4.0 Vol 3 chapter 13.2.1.
>>
>> Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@xxxxxxxxx>
>> ---
>> include/net/bluetooth/hci_core.h | 2 +-
>> net/bluetooth/mgmt.c | 13 +++++++++----
>> 2 files changed, 10 insertions(+), 5 deletions(-)
>>
>> diff --git a/include/net/bluetooth/hci_core.h
>> b/include/net/bluetooth/hci_core.h
>> index e2bfcda..1c6776a 100644
>> --- a/include/net/bluetooth/hci_core.h
>> +++ b/include/net/bluetooth/hci_core.h
>> @@ -1210,7 +1210,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int
>> event);
>> #define DISCOV_LE_SCAN_WIN 0x12
>> #define DISCOV_LE_SCAN_INT 0x12
>> #define DISCOV_LE_TIMEOUT msecs_to_jiffies(10240)
>> -#define DISCOV_INTERLEAVED_TIMEOUT msecs_to_jiffies(5120)
>> +#define DISCOV_INTERLEAVED_TIMEOUT 5120 /* msec */
>> #define DISCOV_INTERLEAVED_INQUIRY_LEN 0x04
>> #define DISCOV_BREDR_INQUIRY_LEN 0x08
>>
>> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
>> index 6487c73..e6d906f 100644
>> --- a/net/bluetooth/mgmt.c
>> +++ b/net/bluetooth/mgmt.c
>> @@ -3352,6 +3352,8 @@ static int mgmt_start_discovery_failed(struct
>> hci_dev *hdev, u8 status)
>>
>> static void start_discovery_complete(struct hci_dev *hdev, u8 status)
>> {
>> + unsigned long timeout = 0;
>> +
>> BT_DBG("status %d", status);
>>
>> if (status) {
>> @@ -3367,13 +3369,11 @@ static void start_discovery_complete(struct
>> hci_dev *hdev, u8 status)
>>
>> switch (hdev->discovery.type) {
>> case DISCOV_TYPE_LE:
>> - queue_delayed_work(hdev->workqueue,
>> &hdev->le_scan_disable,
>> - DISCOV_LE_TIMEOUT);
>> + timeout = DISCOV_LE_TIMEOUT;
>> break;
>>
>> case DISCOV_TYPE_INTERLEAVED:
>> - queue_delayed_work(hdev->workqueue,
>> &hdev->le_scan_disable,
>> - DISCOV_INTERLEAVED_TIMEOUT);
>> + timeout = msecs_to_jiffies(DISCOV_INTERLEAVED_TIMEOUT);
>> break;
>>
>> case DISCOV_TYPE_BREDR:
>> @@ -3382,6 +3382,11 @@ static void start_discovery_complete(struct hci_dev
>> *hdev, u8 status)
>> default:
>> BT_ERR("Invalid discovery type %d", hdev->discovery.type);
>> }
>> +
>> + if (!timeout)
>> + return;
>> +
>> + queue_delayed_work(hdev->workqueue, &hdev->le_scan_disable,
>> timeout);
>
>
> You may want to do like this here:
>
> if (timeout)
> queue_delayed_work(hdev->workqueue, hdev->le_scan_disable,
> timeout);
>
As I can see, in bluetooth module they usually check this way and in
addition I do not have to break the line in queue_delayed_work(...)
call, so I would keep this way.
> BR,
>
> Andre
BR
\Lukasz
--
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
