Skip to contentSkip to conversation

drivers/net/arcnet/arcnet.c: use time_* macros

PATCH Applied [email protected] 1 participant 1 message Mar 28, 2008

Subsystems (3)
Networking Network drivers Arcnet network layer
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 12/21 drivers/net/arcnet/arcnet.c: use time_* macros

From: S.Caglar Onur <[email protected]>

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.

[[email protected]: coding-style fixes]
Signed-off-by S.Caglar Onur <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/net/arcnet/arcnet.c |    5 +++--
 include/linux/arcdevice.h   |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/arcnet/arcnet.c renamed from drivers/net/arcnet/arcnet.c~drivers-net-arcnet-arcnetc-use-time_-macros +3 -2
diff -puN drivers/net/arcnet/arcnet.c~drivers-net-arcnet-arcnetc-use-time_-macros 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;
include/linux/arcdevice.h renamed from include/linux/arcdevice.h~drivers-net-arcnet-arcnetc-use-time_-macros +2 -2
diff -puN include/linux/arcdevice.h~drivers-net-arcnet-arcnetc-use-time_-macros 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? */

_