aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp_async.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/ppp_async.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/ppp_async.c')
-rw-r--r--drivers/net/ppp_async.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index c311fa6597f5..6a375ea4947d 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -558,8 +558,8 @@ ppp_async_encode(struct asyncppp *ap)
558 * Start of a new packet - insert the leading FLAG 558 * Start of a new packet - insert the leading FLAG
559 * character if necessary. 559 * character if necessary.
560 */ 560 */
561 if (islcp || flag_time == 0 561 if (islcp || flag_time == 0 ||
562 || time_after_eq(jiffies, ap->last_xmit + flag_time)) 562 time_after_eq(jiffies, ap->last_xmit + flag_time))
563 *buf++ = PPP_FLAG; 563 *buf++ = PPP_FLAG;
564 ap->last_xmit = jiffies; 564 ap->last_xmit = jiffies;
565 fcs = PPP_INITFCS; 565 fcs = PPP_INITFCS;
@@ -696,8 +696,8 @@ ppp_async_push(struct asyncppp *ap)
696 */ 696 */
697 clear_bit(XMIT_BUSY, &ap->xmit_flags); 697 clear_bit(XMIT_BUSY, &ap->xmit_flags);
698 /* any more work to do? if not, exit the loop */ 698 /* any more work to do? if not, exit the loop */
699 if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags) 699 if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags) ||
700 || (!tty_stuffed && ap->tpkt))) 700 (!tty_stuffed && ap->tpkt)))
701 break; 701 break;
702 /* more work to do, see if we can do it now */ 702 /* more work to do, see if we can do it now */
703 if (test_and_set_bit(XMIT_BUSY, &ap->xmit_flags)) 703 if (test_and_set_bit(XMIT_BUSY, &ap->xmit_flags))
@@ -754,8 +754,8 @@ scan_ordinary(struct asyncppp *ap, const unsigned char *buf, int count)
754 754
755 for (i = 0; i < count; ++i) { 755 for (i = 0; i < count; ++i) {
756 c = buf[i]; 756 c = buf[i];
757 if (c == PPP_ESCAPE || c == PPP_FLAG 757 if (c == PPP_ESCAPE || c == PPP_FLAG ||
758 || (c < 0x20 && (ap->raccm & (1 << c)) != 0)) 758 (c < 0x20 && (ap->raccm & (1 << c)) != 0))
759 break; 759 break;
760 } 760 }
761 return i; 761 return i;