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/slip.c b/drivers/net/slip.c
index 6640469b5d3..ba5bbc50344 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -956,8 +956,8 @@ static void slip_unesc(struct slip *sl, unsigned char s)
                         clear_bit(SLF_KEEPTEST, &sl->flags);
 #endif
 
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                                                        && (sl->rcount > 2))
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    (sl->rcount > 2))
                         sl_bump(sl);
                 clear_bit(SLF_ESCAPE, &sl->flags);
                 sl->rcount = 0;
@@ -1039,8 +1039,8 @@ static void slip_unesc6(struct slip *sl, unsigned char s)
                         clear_bit(SLF_KEEPTEST, &sl->flags);
 #endif
 
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                                                        && (sl->rcount > 2))
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    (sl->rcount > 2))
                         sl_bump(sl);
                 sl->rcount = 0;
                 sl->xbits = 0;