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

diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index cf26f92e3235..a127620dc653 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -827,8 +827,8 @@ static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
                 adapter->detect_tx_hung = false;
                 if (tx_ring->buffer_info[i].time_stamp &&
                     time_after(jiffies, tx_ring->buffer_info[i].time_stamp +
-                               (adapter->tx_timeout_factor * HZ))
-                    && !(er32(STATUS) & E1000_STATUS_TXOFF)) {
+                               (adapter->tx_timeout_factor * HZ)) &&
+                    !(er32(STATUS) & E1000_STATUS_TXOFF)) {
 
                         tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
                         /* detected Tx unit hang */