diff options
| author |   Bruce Allan <bruce.w.allan@intel.com> | 2013-08-15 03:43:24 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-08-22 02:33:24 -0700 |
| commit | 22f8abaa8fa6e62c30eefc8cab99dcaea1f6a882 (patch) | |
| tree | 012d56cbd947800400def67dffc76ddb3e5383a7 /drivers | |
| parent | e1000e: Avoid kernel crash during shutdown (diff) | |
| download | linux-dev-22f8abaa8fa6e62c30eefc8cab99dcaea1f6a882.tar.xz linux-dev-22f8abaa8fa6e62c30eefc8cab99dcaea1f6a882.zip | |
e1000e: resolve checkpatch JIFFIES_COMPARISON warning
WARNING:JIFFIES_COMPARISON: Comparing jiffies is almost always wrong;
prefer time_after, time_before and friends
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index e4ebd7ddf5f2..a8633b8f0ac5 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -1665,7 +1665,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) ret_val = 13; /* ret_val is the same as mis-compare */ break; } - if (jiffies >= (time + 20)) { + if (time_after(jiffies, time + 20)) { ret_val = 14; /* error code for time out error */ break; } |