Bluetooth: Simplify the code for re-arming discoverable timeout
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/1 Bluetooth: Simplify the code for re-arming discoverable timeout
When only the discoverable timeout gets updated, just cancel the current timeout, store the new timeout value. If the new timeout is valid, then arm the discoverable timeout again.
Signed-off-by Marcel Holtmann <[email protected]>
--- net/bluetooth/mgmt.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
net/bluetooth/mgmt.c +5 -7
@@ -1143,15 +1143,13 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data, }if (!!cp->val ==test_bit (HCI_DISCOVERABLE , &hdev->dev_flags)) { -if (hdev->discov_timeout >0 ) { -cancel_delayed_work (&hdev->discov_off); - hdev->discov_timeout =0 ; - } +cancel_delayed_work (&hdev->discov_off); + hdev->discov_timeout = timeout; -if (cp->val && timeout >0 ) { - hdev->discov_timeout = timeout; +if (cp->val && hdev->discov_timeout >0 ) { +int to =msecs_to_jiffies (hdev->discov_timeout *1000 );queue_delayed_work (hdev->workqueue, &hdev->discov_off, -msecs_to_jiffies (hdev->discov_timeout *1000 )); + to); } err =send_settings_rsp (sk,MGMT_OP_SET_DISCOVERABLE , hdev);
Signature · 1 line
1.8.3.1
Johan Hedberg
AppliedHi Marcel,
Quoted 8 lines · Marcel Holtmann
When only the discoverable timeout gets updated, just cancel the current timeout, store the new timeout value. If the new timeout is valid, then arm the discoverable timeout again.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/mgmt.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Applied to bluetooth-next. Thanks.
Johan