Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 6de8399d6dd9..6c2e8fa0ca31 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -31,12 +31,13 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/string.h>
 
 #define PPP_VERSION     "2.4.2"
 
-#define OBUFSIZE        256
+#define OBUFSIZE        4096
 
 /* Structure for storing local state. */
 struct asyncppp {
@@ -337,10 +338,7 @@ ppp_asynctty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
         return 0;
 }
 
-/*
- * This can now be called from hard interrupt level as well
- * as soft interrupt level or mainline.
- */
+/* May sleep, don't call from interrupt level or with interrupts disabled */
 static void
 ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf,
                   char *cflags, int count)
@@ -561,8 +559,8 @@ ppp_async_encode(struct asyncppp *ap)
                  * Start of a new packet - insert the leading FLAG
                  * character if necessary.
                  */
-                if (islcp || flag_time == 0
-                    || time_after_eq(jiffies, ap->last_xmit + flag_time))
+                if (islcp || flag_time == 0 ||
+                    time_after_eq(jiffies, ap->last_xmit + flag_time))
                         *buf++ = PPP_FLAG;
                 ap->last_xmit = jiffies;
                 fcs = PPP_INITFCS;
@@ -699,8 +697,8 @@ ppp_async_push(struct asyncppp *ap)
                  */
                 clear_bit(XMIT_BUSY, &ap->xmit_flags);
                 /* any more work to do? if not, exit the loop */
-                if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags)
-                      || (!tty_stuffed && ap->tpkt)))
+                if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags) ||
+                      (!tty_stuffed && ap->tpkt)))
                         break;
                 /* more work to do, see if we can do it now */
                 if (test_and_set_bit(XMIT_BUSY, &ap->xmit_flags))
@@ -757,8 +755,8 @@ scan_ordinary(struct asyncppp *ap, const unsigned char *buf, int count)
 
         for (i = 0; i < count; ++i) {
                 c = buf[i];
-                if (c == PPP_ESCAPE || c == PPP_FLAG
-                    || (c < 0x20 && (ap->raccm & (1 << c)) != 0))
+                if (c == PPP_ESCAPE || c == PPP_FLAG ||
+                    (c < 0x20 && (ap->raccm & (1 << c)) != 0))
                         break;
         }
         return i;