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>

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 9189354c568f442ccd55efa37d639a613be470ce..0bf8cb17a6e864793f84a4bc8620414a7a396b2f 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -38,8 +38,8 @@
 #define L2CAP_DEFAULT_TX_WINDOW                63
 #define L2CAP_DEFAULT_EXT_WINDOW       0x3FFF
 #define L2CAP_DEFAULT_MAX_TX           3
-#define L2CAP_DEFAULT_RETRANS_TO       2000    /* 2 seconds */
-#define L2CAP_DEFAULT_MONITOR_TO       12000   /* 12 seconds */
+#define L2CAP_DEFAULT_RETRANS_TO       2    /* seconds */
+#define L2CAP_DEFAULT_MONITOR_TO       12   /* seconds */
 #define L2CAP_DEFAULT_MAX_PDU_SIZE     1492    /* Sized for AMP packet */
 #define L2CAP_DEFAULT_ACK_TO           200
 #define L2CAP_DEFAULT_MAX_SDU_SIZE     0xFFFF

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c27ea70f71e1e18d52f943231de3883d3000297c..7b4adab353cf2c6f4d2e79a4ab9d6db2c0f14c04 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -282,7 +282,7 @@ static void __set_retrans_timer(struct l2cap_chan *chan)
        if (!delayed_work_pending(&chan->monitor_timer) &&
            chan->retrans_timeout) {
                l2cap_set_timer(chan, &chan->retrans_timer,
-                               msecs_to_jiffies(chan->retrans_timeout));
+                               secs_to_jiffies(chan->retrans_timeout));
        }
 }
 
@@ -291,7 +291,7 @@ static void __set_monitor_timer(struct l2cap_chan *chan)
        __clear_retrans_timer(chan);
        if (chan->monitor_timeout) {
                l2cap_set_timer(chan, &chan->monitor_timer,
-                               msecs_to_jiffies(chan->monitor_timeout));
+                               secs_to_jiffies(chan->monitor_timeout));
        }
 }