Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756585AbYCQJiR (ORCPT ); Mon, 17 Mar 2008 05:38:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753375AbYCQJhU (ORCPT ); Mon, 17 Mar 2008 05:37:20 -0400 Received: from ns2.uludag.org.tr ([193.140.100.220]:42586 "EHLO uludag.org.tr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752617AbYCQJhO (ORCPT ); Mon, 17 Mar 2008 05:37:14 -0400 From: =?utf-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= To: linux-kernel@vger.kernel.org Cc: Jeff Garzik , David Miller , netdev@vger.kernel.org, Andrew Morton Subject: [PATCH] drivers/net/arcnet/arcnet.c: Use time_* macros Date: Mon, 17 Mar 2008 11:36:27 +0200 Message-Id: <1205746593-24820-5-git-send-email-caglar@pardus.org.tr> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1205746593-24820-4-git-send-email-caglar@pardus.org.tr> References: <> <1205746593-24820-1-git-send-email-caglar@pardus.org.tr> <1205746593-24820-2-git-send-email-caglar@pardus.org.tr> <1205746593-24820-3-git-send-email-caglar@pardus.org.tr> <1205746593-24820-4-git-send-email-caglar@pardus.org.tr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2413 Lines: 57 The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Cc: Jeff Garzik Cc: David Miller Cc: netdev@vger.kernel.org Cc: Andrew Morton Signed-off-by: S.Çağlar Onur --- drivers/net/arcnet/arcnet.c | 4 ++-- include/linux/arcdevice.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index c59c806..c298615 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c @@ -940,7 +940,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) /* is the RECON info empty or old? */ if (!lp->first_recon || !lp->last_recon || - jiffies - lp->last_recon > HZ * 10) { + time_after(jiffies, lp->last_recon + HZ * 10)) { if (lp->network_down) BUGMSG(D_NORMAL, "reconfiguration detected: cabling restored?\n"); lp->first_recon = lp->last_recon = jiffies; @@ -974,7 +974,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) lp->num_recons = 1; } } - } else if (lp->network_down && jiffies - lp->last_recon > HZ * 10) { + } else if (lp->network_down && time_after(jiffies, lp->last_recon + HZ * 10)) { if (lp->network_down) BUGMSG(D_NORMAL, "cabling restored?\n"); lp->first_recon = lp->last_recon = 0; diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index fde6758..9d33768 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h @@ -283,7 +283,7 @@ struct arcnet_local { int next_buf, first_free_buf; /* network "reconfiguration" handling */ - time_t first_recon, /* time of "first" RECON message to count */ + unsigned long first_recon, /* time of "first" RECON message to count */ last_recon; /* time of most recent RECON */ int num_recons; /* number of RECONs between first and last. */ bool network_down; /* do we think the network is down? */ -- 1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/