diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-03-01 14:25:33 -0800 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-03-02 00:33:14 +0200 |
| commit | ba13ccd9b911e043c0f11e60cbb72bd4de194205 (patch) | |
| tree | 7c8437d2693bfa7c438d5ddc59f329b57974c810 /include/net | |
| parent | be22b54e8711734f4cb93ac31723b955fe9dbbe0 (diff) | |
| download | linux-3.10-ba13ccd9b911e043c0f11e60cbb72bd4de194205.tar.gz linux-3.10-ba13ccd9b911e043c0f11e60cbb72bd4de194205.tar.bz2 linux-3.10-ba13ccd9b911e043c0f11e60cbb72bd4de194205.zip | |
Bluetooth: Update L2CAP timeout constants to use msecs_to_jiffies
The L2CAP timeout constants are always used in form of jiffies. So just
include the conversion from msecs in the define itself. This has the
advantage of making the code where the timeout is used more readable.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 3732a4849f2..e4669d0230c 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -45,11 +45,11 @@ #define L2CAP_DEFAULT_SDU_ITIME 0xFFFFFFFF #define L2CAP_DEFAULT_ACC_LAT 0xFFFFFFFF -#define L2CAP_DISC_TIMEOUT (100) -#define L2CAP_DISC_REJ_TIMEOUT (5000) /* 5 seconds */ -#define L2CAP_ENC_TIMEOUT (5000) /* 5 seconds */ -#define L2CAP_CONN_TIMEOUT (40000) /* 40 seconds */ -#define L2CAP_INFO_TIMEOUT (4000) /* 4 seconds */ +#define L2CAP_DISC_TIMEOUT msecs_to_jiffies(100) +#define L2CAP_DISC_REJ_TIMEOUT msecs_to_jiffies(5000) +#define L2CAP_ENC_TIMEOUT msecs_to_jiffies(5000) +#define L2CAP_CONN_TIMEOUT msecs_to_jiffies(40000) +#define L2CAP_INFO_TIMEOUT msecs_to_jiffies(4000) /* L2CAP socket address */ struct sockaddr_l2 { |