diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/wan/x25_asy.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (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/wan/x25_asy.c')
-rw-r--r-- | drivers/net/wan/x25_asy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 3c325d77939b..b9f520b7db6a 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
@@ -657,8 +657,8 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s) | |||
657 | 657 | ||
658 | switch (s) { | 658 | switch (s) { |
659 | case X25_END: | 659 | case X25_END: |
660 | if (!test_and_clear_bit(SLF_ERROR, &sl->flags) | 660 | if (!test_and_clear_bit(SLF_ERROR, &sl->flags) && |
661 | && sl->rcount > 2) | 661 | sl->rcount > 2) |
662 | x25_asy_bump(sl); | 662 | x25_asy_bump(sl); |
663 | clear_bit(SLF_ESCAPE, &sl->flags); | 663 | clear_bit(SLF_ESCAPE, &sl->flags); |
664 | sl->rcount = 0; | 664 | sl->rcount = 0; |