diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-28 19:48:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-28 19:48:26 -0700 |
| commit | 17eed249539a7b756ca65a5cb0940abc48ef553b (patch) | |
| tree | ea8745536e7ee5aaf0d3b03e9d356979daf6bfb0 /drivers/net/arcnet/arcnet.c | |
| parent | 4ad96d39a2d74c1b2e400b602da2594f5098fc26 (diff) | |
| parent | 318a94d68979cbe9cc98a3050b4b7be2f08513c8 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/arcnet/arcnet.c')
| -rw-r--r-- | drivers/net/arcnet/arcnet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index c59c8067de99..bdc4c0bb56d9 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) /* 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; |