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>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index d4ab69f032b..b14f4799d5d 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -350,13 +350,13 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
         slot = -1;
         /* We must check for the EEPROM-config boards first, else accessing
            IOCONFIG0 will move the board! */
-        if (at1700_probe_list[inb(ioaddr + IOCONFIG1) & 0x07] == ioaddr
-                && read_eeprom(ioaddr, 4) == 0x0000
-                && (read_eeprom(ioaddr, 5) & 0xff00) == 0xF400)
+        if (at1700_probe_list[inb(ioaddr + IOCONFIG1) & 0x07] == ioaddr &&
+            read_eeprom(ioaddr, 4) == 0x0000 &&
+            (read_eeprom(ioaddr, 5) & 0xff00) == 0xF400)
                 is_at1700 = 1;
-        else if (inb(ioaddr   + SAPROM    ) == 0x00
-                && inb(ioaddr + SAPROM + 1) == 0x00
-                && inb(ioaddr + SAPROM + 2) == 0x0e)
+        else if (inb(ioaddr + SAPROM    ) == 0x00 &&
+                 inb(ioaddr + SAPROM + 1) == 0x00 &&
+                 inb(ioaddr + SAPROM + 2) == 0x0e)
                 is_fmv18x = 1;
         else {
                 goto err_out;
@@ -839,8 +839,8 @@ set_rx_mode(struct net_device *dev)
         if (dev->flags & IFF_PROMISC) {
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 outb(3, ioaddr + RX_MODE);      /* Enable promiscuous mode */
-        } else if (dev->mc_count > MC_FILTERBREAK
-                           ||  (dev->flags & IFF_ALLMULTI)) {
+        } else if (dev->mc_count > MC_FILTERBREAK ||
+                           (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to filter perfectly -- accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 outb(2, ioaddr + RX_MODE);      /* Use normal mode. */