]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
benet: Use time_before_eq for time comparison
authorKarim Eshapa <karim.eshapa@gmail.com>
Mon, 1 May 2017 13:58:08 +0000 (15:58 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 May 2017 15:12:46 +0000 (11:12 -0400)
Use time_before_eq for time comparison more safe and dealing
with timer wrapping to be future-proof.

Signed-off-by: Karim Eshapa <karim.eshapa@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/emulex/benet/be_main.c

index 8702661b99c06f78a4a891b7afd94b955ee3dc58..f3a09ab559004b80106e957674cb0d6acbf3ea65 100644 (file)
@@ -5268,15 +5268,15 @@ static bool be_err_is_recoverable(struct be_adapter *adapter)
        dev_err(&adapter->pdev->dev, "Recoverable HW error code: 0x%x\n",
                ue_err_code);
 
-       if (jiffies - err_rec->probe_time <= initial_idle_time) {
+       if (time_before_eq(jiffies - err_rec->probe_time, initial_idle_time)) {
                dev_err(&adapter->pdev->dev,
                        "Cannot recover within %lu sec from driver load\n",
                        jiffies_to_msecs(initial_idle_time) / MSEC_PER_SEC);
                return false;
        }
 
-       if (err_rec->last_recovery_time &&
-           (jiffies - err_rec->last_recovery_time <= recovery_interval)) {
+       if (err_rec->last_recovery_time && time_before_eq(
+               jiffies - err_rec->last_recovery_time, recovery_interval)) {
                dev_err(&adapter->pdev->dev,
                        "Cannot recover within %lu sec from last recovery\n",
                        jiffies_to_msecs(recovery_interval) / MSEC_PER_SEC);