Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: S.Caglar Onur <caglar@pardus.org.tr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by

S.Caglar Onur and committed by
Jeff Garzik
9307b570 ac4bed13

+5 -4
+3 -2
drivers/net/arcnet/arcnet.c
··· 940 940 941 941 /* is the RECON info empty or old? */ 942 942 if (!lp->first_recon || !lp->last_recon || 943 - jiffies - lp->last_recon > HZ * 10) { 943 + time_after(jiffies, lp->last_recon + HZ * 10)) { 944 944 if (lp->network_down) 945 945 BUGMSG(D_NORMAL, "reconfiguration detected: cabling restored?\n"); 946 946 lp->first_recon = lp->last_recon = jiffies; ··· 974 974 lp->num_recons = 1; 975 975 } 976 976 } 977 - } else if (lp->network_down && jiffies - lp->last_recon > HZ * 10) { 977 + } else if (lp->network_down && 978 + time_after(jiffies, lp->last_recon + HZ * 10)) { 978 979 if (lp->network_down) 979 980 BUGMSG(D_NORMAL, "cabling restored?\n"); 980 981 lp->first_recon = lp->last_recon = 0;
+2 -2
include/linux/arcdevice.h
··· 283 283 int next_buf, first_free_buf; 284 284 285 285 /* network "reconfiguration" handling */ 286 - time_t first_recon, /* time of "first" RECON message to count */ 287 - last_recon; /* time of most recent RECON */ 286 + unsigned long first_recon; /* time of "first" RECON message to count */ 287 + unsigned long last_recon; /* time of most recent RECON */ 288 288 int num_recons; /* number of RECONs between first and last. */ 289 289 bool network_down; /* do we think the network is down? */ 290 290