aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/arcnet/arcnet.c5
-rw-r--r--include/linux/arcdevice.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index c59c8067de9..bdc4c0bb56d 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)
940 940
941 /* is the RECON info empty or old? */ 941 /* is the RECON info empty or old? */
942 if (!lp->first_recon || !lp->last_recon || 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 if (lp->network_down) 944 if (lp->network_down)
945 BUGMSG(D_NORMAL, "reconfiguration detected: cabling restored?\n"); 945 BUGMSG(D_NORMAL, "reconfiguration detected: cabling restored?\n");
946 lp->first_recon = lp->last_recon = jiffies; 946 lp->first_recon = lp->last_recon = jiffies;
@@ -974,7 +974,8 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
974 lp->num_recons = 1; 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 if (lp->network_down) 979 if (lp->network_down)
979 BUGMSG(D_NORMAL, "cabling restored?\n"); 980 BUGMSG(D_NORMAL, "cabling restored?\n");
980 lp->first_recon = lp->last_recon = 0; 981 lp->first_recon = lp->last_recon = 0;
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index fde675872c5..a1916078fd0 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -283,8 +283,8 @@ struct arcnet_local {
283 int next_buf, first_free_buf; 283 int next_buf, first_free_buf;
284 284
285 /* network "reconfiguration" handling */ 285 /* network "reconfiguration" handling */
286 time_t first_recon, /* time of "first" RECON message to count */ 286 unsigned long first_recon; /* time of "first" RECON message to count */
287 last_recon; /* time of most recent RECON */ 287 unsigned long last_recon; /* time of most recent RECON */
288 int num_recons; /* number of RECONs between first and last. */ 288 int num_recons; /* number of RECONs between first and last. */
289 bool network_down; /* do we think the network is down? */ 289 bool network_down; /* do we think the network is down? */
290 290