diff options
Diffstat (limited to 'drivers/net/arcnet')
-rw-r--r-- | drivers/net/arcnet/arcnet.c | 5 | ||||
-rw-r--r-- | drivers/net/arcnet/com20020.c | 7 |
2 files changed, 7 insertions, 5 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; |
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 7cf0a2511697..8b51313b1300 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c | |||
@@ -348,14 +348,15 @@ MODULE_LICENSE("GPL"); | |||
348 | 348 | ||
349 | #ifdef MODULE | 349 | #ifdef MODULE |
350 | 350 | ||
351 | int init_module(void) | 351 | static int __init com20020_module_init(void) |
352 | { | 352 | { |
353 | BUGLVL(D_NORMAL) printk(VERSION); | 353 | BUGLVL(D_NORMAL) printk(VERSION); |
354 | return 0; | 354 | return 0; |
355 | } | 355 | } |
356 | 356 | ||
357 | void cleanup_module(void) | 357 | static void __exit com20020_module_exit(void) |
358 | { | 358 | { |
359 | } | 359 | } |
360 | 360 | module_init(com20020_module_init); | |
361 | module_exit(com20020_module_exit); | ||
361 | #endif /* MODULE */ | 362 | #endif /* MODULE */ |