drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
3454f83583
commit
8e95a2026f
@ -301,8 +301,8 @@ static int choose_mtu(void)
|
||||
|
||||
/* choose the smallest MTU of all available encaps */
|
||||
for (count = 0; count < 256; count++) {
|
||||
if (arc_proto_map[count] != &arc_proto_null
|
||||
&& arc_proto_map[count]->mtu < mtu) {
|
||||
if (arc_proto_map[count] != &arc_proto_null &&
|
||||
arc_proto_map[count]->mtu < mtu) {
|
||||
mtu = arc_proto_map[count]->mtu;
|
||||
}
|
||||
}
|
||||
@ -953,13 +953,13 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
* > RECON_THRESHOLD/min;
|
||||
* then print a warning message.
|
||||
*/
|
||||
if (!lp->network_down
|
||||
&& (lp->last_recon - lp->first_recon) <= HZ * 60
|
||||
&& lp->num_recons >= RECON_THRESHOLD) {
|
||||
if (!lp->network_down &&
|
||||
(lp->last_recon - lp->first_recon) <= HZ * 60 &&
|
||||
lp->num_recons >= RECON_THRESHOLD) {
|
||||
lp->network_down = 1;
|
||||
BUGMSG(D_NORMAL, "many reconfigurations detected: cabling problem?\n");
|
||||
} else if (!lp->network_down
|
||||
&& lp->last_recon - lp->first_recon > HZ * 60) {
|
||||
} else if (!lp->network_down &&
|
||||
lp->last_recon - lp->first_recon > HZ * 60) {
|
||||
/* reset counters if we've gone for over a minute. */
|
||||
lp->first_recon = lp->last_recon;
|
||||
lp->num_recons = 1;
|
||||
|
Reference in New Issue
Block a user