diff options
Diffstat (limited to 'drivers/net/arcnet/arcnet.c')
-rw-r--r-- | drivers/net/arcnet/arcnet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index 75a572560909..d8f029303754 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c | |||
@@ -301,8 +301,8 @@ static int choose_mtu(void) | |||
301 | 301 | ||
302 | /* choose the smallest MTU of all available encaps */ | 302 | /* choose the smallest MTU of all available encaps */ |
303 | for (count = 0; count < 256; count++) { | 303 | for (count = 0; count < 256; count++) { |
304 | if (arc_proto_map[count] != &arc_proto_null | 304 | if (arc_proto_map[count] != &arc_proto_null && |
305 | && arc_proto_map[count]->mtu < mtu) { | 305 | arc_proto_map[count]->mtu < mtu) { |
306 | mtu = arc_proto_map[count]->mtu; | 306 | mtu = arc_proto_map[count]->mtu; |
307 | } | 307 | } |
308 | } | 308 | } |
@@ -953,13 +953,13 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) | |||
953 | * > RECON_THRESHOLD/min; | 953 | * > RECON_THRESHOLD/min; |
954 | * then print a warning message. | 954 | * then print a warning message. |
955 | */ | 955 | */ |
956 | if (!lp->network_down | 956 | if (!lp->network_down && |
957 | && (lp->last_recon - lp->first_recon) <= HZ * 60 | 957 | (lp->last_recon - lp->first_recon) <= HZ * 60 && |
958 | && lp->num_recons >= RECON_THRESHOLD) { | 958 | lp->num_recons >= RECON_THRESHOLD) { |
959 | lp->network_down = 1; | 959 | lp->network_down = 1; |
960 | BUGMSG(D_NORMAL, "many reconfigurations detected: cabling problem?\n"); | 960 | BUGMSG(D_NORMAL, "many reconfigurations detected: cabling problem?\n"); |
961 | } else if (!lp->network_down | 961 | } else if (!lp->network_down && |
962 | && lp->last_recon - lp->first_recon > HZ * 60) { | 962 | lp->last_recon - lp->first_recon > HZ * 60) { |
963 | /* reset counters if we've gone for over a minute. */ | 963 | /* reset counters if we've gone for over a minute. */ |
964 | lp->first_recon = lp->last_recon; | 964 | lp->first_recon = lp->last_recon; |
965 | lp->num_recons = 1; | 965 | lp->num_recons = 1; |