diff options
author | S.Caglar Onur <caglar@pardus.org.tr> | 2008-03-28 17:41:24 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-28 22:14:15 -0400 |
commit | 9307b570a745da4f2d83195f5337927e98221bb2 (patch) | |
tree | b07632eee7e40683c2977164d822ef262ab406d6 /drivers/net/arcnet | |
parent | ac4bed1375c06af7c76b4615ae661791b62e93ef (diff) |
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>
Diffstat (limited to 'drivers/net/arcnet')
-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) | |||
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; |