Bluetooth: Add missing msecs to jiffies conversion
authorAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Fri, 16 May 2014 14:48:57 +0000 (16:48 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 16 May 2014 15:23:01 +0000 (08:23 -0700)
conn_info_age value is calculated in ms, so need to be converted to
jiffies.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/mgmt.c

index 17ebaa3b01bb17d120c88e0065855df148942e8c..370cd42f488be7f71ba610123a83066a36cc56e1 100644 (file)
@@ -4708,7 +4708,8 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data,
        /* Query controller to refresh cached values if they are too old or were
         * never read.
         */
-       if (time_after(jiffies, conn->conn_info_timestamp + conn_info_age) ||
+       if (time_after(jiffies, conn->conn_info_timestamp +
+                      msecs_to_jiffies(conn_info_age)) ||
            !conn->conn_info_timestamp) {
                struct hci_request req;
                struct hci_cp_read_tx_power req_txp_cp;