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, 4 insertions, 4 deletions

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 703b4c8e9b4d..41494f7b2ec8 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -630,8 +630,8 @@ static int mdio_read(struct net_device *dev, int phy_id, int location)
                 barrier();
                 if ((inl(ioaddr + MIICtrl) & MII_READOP) == 0) {
                         /* Work around read failure bug. */
-                        if (phy_id == 1 && location < 6
-                                && inw(ioaddr + MIIData) == 0xffff) {
+                        if (phy_id == 1 && location < 6 &&
+                            inw(ioaddr + MIIData) == 0xffff) {
                                 outl(read_cmd, ioaddr + MIICtrl);
                                 continue;
                         }
@@ -1205,8 +1205,8 @@ static int epic_rx(struct net_device *dev, int budget)
                         }
                         /* 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(ep->pci_dev,
                                                             ep->rx_ring[entry].bufaddr,