Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9307b570 authored by S.Çağlar Onur's avatar S.Çağlar Onur Committed by Jeff Garzik
Browse files

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



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: default avatarS.Caglar Onur <caglar@pardus.org.tr>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ac4bed13

drivers/net/arcnet/arcnet.c

+3 −2
Original line number Diff line number Diff line
@@ -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,8 @@ 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;

include/linux/arcdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -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? */