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>

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index c5b988140a91..e6afab2455b1 100644
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -174,9 +174,9 @@ static int __init arcrimi_found(struct net_device *dev)
          * 2k (or there are no mirrors at all) but on some, it's 4k.
          */
         mirror_size = MIRROR_SIZE;
-        if (readb(p) == TESTvalue
-            && check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0
-            && check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1)
+        if (readb(p) == TESTvalue &&
+            check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 &&
+            check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1)
                 mirror_size = 2 * MIRROR_SIZE;
 
         first_mirror = shmem - mirror_size;
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)
 
         /* 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;