From: Manuel Schölling Date: Fri, 23 May 2014 18:04:17 +0000 (+0000) Subject: e1000: Use time_after() for time comparison X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1aa65f4d7f8a9c7415224881a2df461ed711d9e3;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git e1000: Use time_after() for time comparison To be future-proof and for better readability the time comparisons are modified to use time_after() instead of plain, error-prone math. Signed-off-by: Manuel Schölling Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 341889a4ef7f..08b207df1459 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c @@ -1460,7 +1460,8 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) * enough time to complete the receives, if it's * exceeded, break and error off */ - } while (good_cnt < 64 && jiffies < (time + 20)); + } while (good_cnt < 64 && time_after(time + 20, jiffies)); + if (good_cnt != 64) { ret_val = 13; /* ret_val is the same as mis-compare */ break;