From patchwork Thu May 22 20:21:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Manuel_Sch=C3=B6lling?= X-Patchwork-Id: 351598 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 75344140086 for ; Fri, 23 May 2014 06:22:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbaEVUVz (ORCPT ); Thu, 22 May 2014 16:21:55 -0400 Received: from mout.gmx.net ([212.227.15.15]:63484 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbaEVUVv (ORCPT ); Thu, 22 May 2014 16:21:51 -0400 Received: from schoellingm.dzne.de ([37.24.147.246]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MN604-1Wgwif3xDU-006bVT; Thu, 22 May 2014 22:21:38 +0200 From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= To: jeffrey.t.kirsher@intel.com Cc: jesse.brandeburg@intel.com, bruce.w.allan@intel.com, e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, =?UTF-8?q?Manuel=20Sch=C3=B6lling?= Subject: [PATCH] e1000: Use time_after() for time comparison Date: Thu, 22 May 2014 22:21:30 +0200 Message-Id: <1400790090-13404-1-git-send-email-manuel.schoelling@gmx.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Provags-ID: V03:K0:aYKZZHS0UwOEH/G06r38lBE5AiRPCC+X8C3KdVYahBQ+JhYq/r8 GQ8urFwWZ+R4TCkzT6png2mHJm5io6TdBTbwgd2sPeSVh9fmLYsf/b4pnlqfaODAo/LtxPW d1Q9rDymYWKZYfM/NqNs785fsW39oepsYN6yQfCmFfAsuMyMeE0m0yrmZ95DO4iGki6VnbU 3EkV0+Ke/+aQF+toDoWnQ== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 73a8aee..1cbf281 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;