Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Bluetooth: L2CAP: convert timeouts to secs_to_jiffies()
Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies(). As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies() for readability.
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
authored by
Easwar Hariharan
and committed by
Luiz Augusto von Dentz
c9d84da1
3f0a819e
+4
-4
+2
-2
include/net/bluetooth/l2cap.h
+2
-2
include/net/bluetooth/l2cap.h
···
38
38
#define L2CAP_DEFAULT_TX_WINDOW 63
39
39
#define L2CAP_DEFAULT_EXT_WINDOW 0x3FFF
40
40
#define L2CAP_DEFAULT_MAX_TX 3
41
-
#define L2CAP_DEFAULT_RETRANS_TO 2000 /* 2 seconds */
42
-
#define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */
41
+
#define L2CAP_DEFAULT_RETRANS_TO 2 /* seconds */
42
+
#define L2CAP_DEFAULT_MONITOR_TO 12 /* seconds */
43
43
#define L2CAP_DEFAULT_MAX_PDU_SIZE 1492 /* Sized for AMP packet */
44
44
#define L2CAP_DEFAULT_ACK_TO 200
45
45
#define L2CAP_DEFAULT_MAX_SDU_SIZE 0xFFFF
+2
-2
net/bluetooth/l2cap_core.c
+2
-2
net/bluetooth/l2cap_core.c
···
282
282
if (!delayed_work_pending(&chan->monitor_timer) &&
283
283
chan->retrans_timeout) {
284
284
l2cap_set_timer(chan, &chan->retrans_timer,
285
-
msecs_to_jiffies(chan->retrans_timeout));
285
+
secs_to_jiffies(chan->retrans_timeout));
286
286
}
287
287
}
288
288
···
291
291
__clear_retrans_timer(chan);
292
292
if (chan->monitor_timeout) {
293
293
l2cap_set_timer(chan, &chan->monitor_timer,
294
-
msecs_to_jiffies(chan->monitor_timeout));
294
+
secs_to_jiffies(chan->monitor_timeout));
295
295
}
296
296
}
297
297