aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/slip.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/slip.c
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
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>
Diffstat (limited to 'drivers/net/slip.c')
-rw-r--r--drivers/net/slip.c8
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)
956 clear_bit(SLF_KEEPTEST, &sl->flags); 956 clear_bit(SLF_KEEPTEST, &sl->flags);
957#endif 957#endif
958 958
959 if (!test_and_clear_bit(SLF_ERROR, &sl->flags) 959 if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
960 && (sl->rcount > 2)) 960 (sl->rcount > 2))
961 sl_bump(sl); 961 sl_bump(sl);
962 clear_bit(SLF_ESCAPE, &sl->flags); 962 clear_bit(SLF_ESCAPE, &sl->flags);
963 sl->rcount = 0; 963 sl->rcount = 0;
@@ -1039,8 +1039,8 @@ static void slip_unesc6(struct slip *sl, unsigned char s)
1039 clear_bit(SLF_KEEPTEST, &sl->flags); 1039 clear_bit(SLF_KEEPTEST, &sl->flags);
1040#endif 1040#endif
1041 1041
1042 if (!test_and_clear_bit(SLF_ERROR, &sl->flags) 1042 if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
1043 && (sl->rcount > 2)) 1043 (sl->rcount > 2))
1044 sl_bump(sl); 1044 sl_bump(sl);
1045 sl->rcount = 0; 1045 sl->rcount = 0;
1046 sl->xbits = 0; 1046 sl->xbits = 0;