diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-03-01 14:32:37 -0800 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-03-02 00:35:57 +0200 |
| commit | 17b02e625662906f370a3eb5e7495cf06ed7d4a4 (patch) | |
| tree | db12888e81d5520bb050700d9179842976795f22 /net/bluetooth/smp.c | |
| parent | ba13ccd9b911e043c0f11e60cbb72bd4de194205 (diff) | |
| download | linux-3.10-17b02e625662906f370a3eb5e7495cf06ed7d4a4.tar.gz linux-3.10-17b02e625662906f370a3eb5e7495cf06ed7d4a4.tar.bz2 linux-3.10-17b02e625662906f370a3eb5e7495cf06ed7d4a4.zip | |
Bluetooth: Update MGMT and SMP timeout constants to use msecs_to_jiffies
The MGMT and SMP 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 'net/bluetooth/smp.c')
| -rw-r--r-- | net/bluetooth/smp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index f6a6d8be305..75937d73d8a 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -29,7 +29,7 @@ #include <linux/scatterlist.h> #include <crypto/b128ops.h> -#define SMP_TIMEOUT 30000 /* 30 seconds */ +#define SMP_TIMEOUT msecs_to_jiffies(30000) static inline void swap128(u8 src[16], u8 dst[16]) { @@ -186,8 +186,7 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data) hci_send_acl(conn->hchan, skb, 0); cancel_delayed_work_sync(&conn->security_timer); - schedule_delayed_work(&conn->security_timer, - msecs_to_jiffies(SMP_TIMEOUT)); + schedule_delayed_work(&conn->security_timer, SMP_TIMEOUT); } static __u8 authreq_to_seclevel(__u8 authreq) |