All of lore.kernel.org
 help / color / mirror / Atom feed
* - drivers-net-arcnet-arcnetc-use-time_-macros.patch removed from -mm tree
@ 2008-03-31 20:18 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2008-03-31 20:18 UTC (permalink / raw)
  To: caglar, jeff, mm-commits


The patch titled
     drivers/net/arcnet/arcnet.c: use time_* macros
has been removed from the -mm tree.  Its filename was
     drivers-net-arcnet-arcnetc-use-time_-macros.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: drivers/net/arcnet/arcnet.c: use time_* macros
From: S.Caglar Onur <caglar@pardus.org.tr>

The functions time_before, time_before_eq, time_after, and time_after_eq are
more robust for comparing jiffies against other values.

So use the time_after() macro, defined in linux/jiffies.h, which deals with
wrapping correctly.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: S.Caglar Onur <caglar@pardus.org.tr>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/arcnet/arcnet.c |    5 +++--
 include/linux/arcdevice.h   |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff -puN drivers/net/arcnet/arcnet.c~drivers-net-arcnet-arcnetc-use-time_-macros drivers/net/arcnet/arcnet.c
--- a/drivers/net/arcnet/arcnet.c~drivers-net-arcnet-arcnetc-use-time_-macros
+++ a/drivers/net/arcnet/arcnet.c
@@ -940,7 +940,7 @@ irqreturn_t arcnet_interrupt(int irq, vo
 
 			/* 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,8 @@ irqreturn_t arcnet_interrupt(int irq, vo
 					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 -puN include/linux/arcdevice.h~drivers-net-arcnet-arcnetc-use-time_-macros include/linux/arcdevice.h
--- a/include/linux/arcdevice.h~drivers-net-arcnet-arcnetc-use-time_-macros
+++ a/include/linux/arcdevice.h
@@ -283,8 +283,8 @@ struct arcnet_local {
 	int next_buf, first_free_buf;
 
 	/* network "reconfiguration" handling */
-	time_t first_recon,	/* time of "first" RECON message to count */
-		last_recon;	/* time of most recent RECON */
+	unsigned long first_recon; /* time of "first" RECON message to count */
+	unsigned long 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? */
 
_

Patches currently in -mm which might be from caglar@pardus.org.tr are

git-powerpc.patch
arch-ia64-kernel-use-time_-macros.patch
git-net.patch
arch-parisc-kernel-unalignedc-use-time_-macros.patch
fix-indentation.patch
arch-alpha-kernel-trapsc-use-time_-macros.patch
arch-alpha-kernel-trapsc-use-time_-macros-fix.patch
fs-binfmt_aoutc-use-printk_ratelimit.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-03-31 20:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-31 20:18 - drivers-net-arcnet-arcnetc-use-time_-macros.patch removed from -mm tree akpm

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.