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>

8 files changed, 40 insertions, 38 deletions

diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index db7d5e11855d..9f6742fad6ca 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -209,10 +209,10 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
                         printk(KERN_DEBUG "%s:  Setting CSR6 %8.8x/%x CSR12 %8.8x.\n",
                                    dev->name, tp->csr6, ioread32(ioaddr + CSR6),
                                    ioread32(ioaddr + CSR12));
-        } else if ((tp->nwayset  &&  (csr5 & 0x08000000)
-                                && (dev->if_port == 3  ||  dev->if_port == 5)
-                                && (csr12 & 2) == 2) ||
-                           (tp->nway && (csr5 & (TPLnkFail)))) {
+        } else if ((tp->nwayset  &&  (csr5 & 0x08000000) &&
+                    (dev->if_port == 3  ||  dev->if_port == 5) &&
+                    (csr12 & 2) == 2) ||
+                   (tp->nway && (csr5 & (TPLnkFail)))) {
                 /* Link blew? Maybe restart NWay. */
                 del_timer_sync(&tp->timer);
                 t21142_start_nway(dev);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 74e5ba42d38d..d4255d44cb75 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -62,9 +62,9 @@ module_param (debug, int, 0);
 MODULE_PARM_DESC (debug, "de2104x bitmapped message enable number");
 
 /* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
-#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
-        || defined(CONFIG_SPARC) || defined(__ia64__) \
-        || defined(__sh__) || defined(__mips__)
+#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) || \
+        defined(CONFIG_SPARC) || defined(__ia64__) ||              \
+        defined(__sh__) || defined(__mips__)
 static int rx_copybreak = 1518;
 #else
 static int rx_copybreak = 100;
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 391acd32a6a5..889f57aae89b 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -174,10 +174,10 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
                 }
           /* Do a fix-up based on the vendor half of the station address prefix. */
           for (i = 0; eeprom_fixups[i].name; i++) {
-                if (dev->dev_addr[0] == eeprom_fixups[i].addr0
-                        &&  dev->dev_addr[1] == eeprom_fixups[i].addr1
-                        &&  dev->dev_addr[2] == eeprom_fixups[i].addr2) {
-                  if (dev->dev_addr[2] == 0xE8  &&  ee_data[0x1a] == 0x55)
+                  if (dev->dev_addr[0] == eeprom_fixups[i].addr0 &&
+                      dev->dev_addr[1] == eeprom_fixups[i].addr1 &&
+                      dev->dev_addr[2] == eeprom_fixups[i].addr2) {
+                  if (dev->dev_addr[2] == 0xE8 && ee_data[0x1a] == 0x55)
                           i++;                  /* An Accton EN1207, not an outlaw Maxtech. */
                   memcpy(ee_data + 26, eeprom_fixups[i].newtable,
                                  sizeof(eeprom_fixups[i].newtable));
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index c8d220cf2cce..2e8e8ee893c7 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -170,8 +170,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
                                       RxDescCollisionSeen |
                                       RxDescRunt |
                                       RxDescDescErr |
-                                      RxWholePkt)) != RxWholePkt
-                           || pkt_len > 1518) {
+                                      RxWholePkt)) != RxWholePkt ||
+                           pkt_len > 1518) {
                                if ((status & (RxLengthOver2047 |
                                               RxWholePkt)) != RxWholePkt) {
                                 /* Ingore earlier buffers. */
@@ -201,8 +201,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
 
                                /* Check if the packet is long enough to accept without copying
                                   to a minimally-sized skbuff. */
-                               if (pkt_len < tulip_rx_copybreak
-                                   && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                               if (pkt_len < tulip_rx_copybreak &&
+                                   (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
                                        skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                        pci_dma_sync_single_for_cpu(tp->pdev,
                                                                    tp->rx_buffers[entry].mapping,
@@ -395,8 +395,8 @@ static int tulip_rx(struct net_device *dev)
                                RxDescCollisionSeen |
                                RxDescRunt |
                                RxDescDescErr |
-                               RxWholePkt))        != RxWholePkt
-                     || pkt_len > 1518) {
+                               RxWholePkt))        != RxWholePkt ||
+                    pkt_len > 1518) {
                         if ((status & (RxLengthOver2047 |
                              RxWholePkt))         != RxWholePkt) {
                                 /* Ingore earlier buffers. */
@@ -425,8 +425,8 @@ static int tulip_rx(struct net_device *dev)
 
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
-                        if (pkt_len < tulip_rx_copybreak
-                                && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                        if (pkt_len < tulip_rx_copybreak &&
+                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(tp->pdev,
                                                             tp->rx_buffers[entry].mapping,
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index daddfa51853e..d8fda83705bf 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -468,8 +468,8 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx)
                 int phy = phyn & 0x1f;
                 int mii_status = tulip_mdio_read (dev, phy, MII_BMSR);
                 if ((mii_status & 0x8301) == 0x8001 ||
-                    ((mii_status & BMSR_100BASE4) == 0
-                     && (mii_status & 0x7800) != 0)) {
+                    ((mii_status & BMSR_100BASE4) == 0 &&
+                     (mii_status & 0x7800) != 0)) {
                         /* preserve Becker logic, gain indentation level */
                 } else {
                         continue;
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index f49579128fb5..d8418694bf46 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -316,9 +316,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
                 }
         }
 
-        if ((tp->nwayset  &&  (csr5 & 0x08000000)
-                          && (dev->if_port == 3  ||  dev->if_port == 5)
-                          && (csr12 & 2) == 2) || (tp->nway && (csr5 & (TPLnkFail)))) {
+        if ((tp->nwayset  &&  (csr5 & 0x08000000) &&
+             (dev->if_port == 3  ||  dev->if_port == 5) &&
+             (csr12 & 2) == 2) || (tp->nway && (csr5 & (TPLnkFail)))) {
 
                 /* Link blew? Maybe restart NWay. */
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 0df983bc03a6..0fa3140d65bf 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -64,9 +64,9 @@ const char * const medianame[32] = {
 };
 
 /* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
-#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
-        || defined(CONFIG_SPARC) || defined(__ia64__) \
-        || defined(__sh__) || defined(__mips__)
+#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) || \
+        defined(CONFIG_SPARC) || defined(__ia64__) || \
+        defined(__sh__) || defined(__mips__)
 static int rx_copybreak = 1518;
 #else
 static int rx_copybreak = 100;
@@ -449,8 +449,8 @@ media_picked:
                         iowrite32(0x0201B078, ioaddr + 0xB8);
                         next_tick = 1*HZ;
                 }
-        } else if ((tp->chip_id == MX98713 || tp->chip_id == COMPEX9881)
-                           && ! tp->medialock) {
+        } else if ((tp->chip_id == MX98713 || tp->chip_id == COMPEX9881) &&
+                   ! tp->medialock) {
                 dev->if_port = 0;
                 tp->csr6 = 0x01880000 | (tp->full_duplex ? 0x0200 : 0);
                 iowrite32(0x0f370000 | ioread16(ioaddr + 0x80), ioaddr + 0x80);
@@ -535,9 +535,9 @@ static void tulip_tx_timeout(struct net_device *dev)
                 if (tulip_debug > 1)
                         printk(KERN_WARNING "%s: Transmit timeout using MII device.\n",
                                    dev->name);
-        } else if (tp->chip_id == DC21140 || tp->chip_id == DC21142
-                           || tp->chip_id == MX98713 || tp->chip_id == COMPEX9881
-                           || tp->chip_id == DM910X) {
+        } else if (tp->chip_id == DC21140 || tp->chip_id == DC21142 ||
+                   tp->chip_id == MX98713 || tp->chip_id == COMPEX9881 ||
+                   tp->chip_id == DM910X) {
                 printk(KERN_WARNING "%s: 21140 transmit timed out, status %8.8x, "
                            "SIA %8.8x %8.8x %8.8x %8.8x, resetting...\n",
                            dev->name, ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR12),
@@ -1538,8 +1538,10 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                 }
         }
         /* Lite-On boards have the address byte-swapped. */
-        if ((dev->dev_addr[0] == 0xA0  ||  dev->dev_addr[0] == 0xC0 || dev->dev_addr[0] == 0x02)
-                &&  dev->dev_addr[1] == 0x00)
+        if ((dev->dev_addr[0] == 0xA0 ||
+             dev->dev_addr[0] == 0xC0 ||
+             dev->dev_addr[0] == 0x02) &&
+            dev->dev_addr[1] == 0x00)
                 for (i = 0; i < 6; i+=2) {
                         char tmp = dev->dev_addr[i];
                         dev->dev_addr[i] = dev->dev_addr[i+1];
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 1a52729c9466..869a7a0005f9 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1230,8 +1230,8 @@ static int netdev_rx(struct net_device *dev)
 #endif
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
-                        if (pkt_len < rx_copybreak
-                                && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                        if (pkt_len < rx_copybreak &&
+                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
                                                             np->rx_skbuff[entry]->len,
@@ -1357,8 +1357,8 @@ static u32 __set_rx_mode(struct net_device *dev)
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = RxAcceptBroadcast | AcceptMulticast | RxAcceptAllPhys
                         | AcceptMyPhys;
-        } else if ((dev->mc_count > multicast_filter_limit)
-                           ||  (dev->flags & IFF_ALLMULTI)) {
+        } else if ((dev->mc_count > multicast_filter_limit) ||
+                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to match, or accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys;