aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaf Vertz <asaf.vertz@tandemg.com>2015-01-08 01:01:00 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-01-22 21:10:15 -0500
commitd5c7d7f6427cd7c39353d09bf47bfbc7800b6a53 (patch)
tree57a9217f78bc38954f841bea5194a350e1793f3b
parent0c49087462e8587c12ecfeaf1dd46fdc0ddc4532 (diff)
e1000: fix time comparison
To be future-proof and for better readability the time comparisons are modified to use time_after_eq() instead of plain, error-prone math. Signed-off-by: Asaf Vertz <asaf.vertz@tandemg.com> Acked-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_ethtool.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index b691eb4f6376..4270ad2d4ddf 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -24,6 +24,7 @@
24/* ethtool support for e1000 */ 24/* ethtool support for e1000 */
25 25
26#include "e1000.h" 26#include "e1000.h"
27#include <linux/jiffies.h>
27#include <linux/uaccess.h> 28#include <linux/uaccess.h>
28 29
29enum {NETDEV_STATS, E1000_STATS}; 30enum {NETDEV_STATS, E1000_STATS};
@@ -1460,7 +1461,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
1460 ret_val = 13; /* ret_val is the same as mis-compare */ 1461 ret_val = 13; /* ret_val is the same as mis-compare */
1461 break; 1462 break;
1462 } 1463 }
1463 if (jiffies >= (time + 2)) { 1464 if (time_after_eq(jiffies, time + 2)) {
1464 ret_val = 14; /* error code for time out error */ 1465 ret_val = 14; /* error code for time out error */
1465 break; 1466 break;
1466 } 1467 }