Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9345d40c authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Use AUTO_OFF constant in jiffies 



Move AUTO_OFF_TIMEOUT to other constants changing name to
HCI_AUTO_OFF_TIMEOUT and convert to jiffies.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 33cef264

include/net/bluetooth/hci.h

+2 −1
Original line number Diff line number Diff line
@@ -142,8 +142,9 @@ enum { 
#define HCI_DISCONN_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_PAIRING_TIMEOUT	msecs_to_jiffies(60000)	/* 60 seconds */

#define HCI_INIT_TIMEOUT	msecs_to_jiffies(10000)	/* 10 seconds */

#define HCI_CMD_TIMEOUT		msecs_to_jiffies(1000)	/* 1 seconds */

#define HCI_CMD_TIMEOUT		msecs_to_jiffies(1000)	/* 1 second */

#define HCI_ACL_TX_TIMEOUT	msecs_to_jiffies(45000)	/* 45 seconds */

#define HCI_AUTO_OFF_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */



/* HCI data types */

#define HCI_COMMAND_PKT		0x01

net/bluetooth/hci_core.c

+1 −4
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#define AUTO_OFF_TIMEOUT 2000



static void hci_rx_work(struct work_struct *work);

static void hci_cmd_work(struct work_struct *work);

static void hci_tx_work(struct work_struct *work);
@@ -1083,8 +1081,7 @@ static void hci_power_on(struct work_struct *work) 
		return;



	if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))

		schedule_delayed_work(&hdev->power_off,

				      msecs_to_jiffies(AUTO_OFF_TIMEOUT));

		schedule_delayed_work(&hdev->power_off, HCI_AUTO_OFF_TIMEOUT);



	if (test_and_clear_bit(HCI_SETUP, &hdev->dev_flags))

		mgmt_index_added(hdev);