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

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 302ea0b7b235..f845837e4aa5 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4621,13 +4621,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) -
                       ETH_FCS_LEN;
 
-                if (len > RX_COPY_THRESHOLD
-                        && tp->rx_offset == NET_IP_ALIGN
-                        /* rx_offset will likely not equal NET_IP_ALIGN
-                         * if this is a 5701 card running in PCI-X mode
-                         * [see tg3_get_invariants()]
-                         */
-                ) {
+                if (len > RX_COPY_THRESHOLD &&
+                    tp->rx_offset == NET_IP_ALIGN) {
+                    /* rx_offset will likely not equal NET_IP_ALIGN
+                     * if this is a 5701 card running in PCI-X mode
+                     * [see tg3_get_invariants()]
+                     */
                         int skb_size;
 
                         skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key,