Fixed Linux 2.2.20 kernel MPPE patch (Frank Cusack)
authorDavid F. Skoll <dfs@roaringpenguin.com>
Tue, 2 Apr 2002 14:11:04 +0000 (14:11 +0000)
committerDavid F. Skoll <dfs@roaringpenguin.com>
Tue, 2 Apr 2002 14:11:04 +0000 (14:11 +0000)
linux/mppe/linux-2.2.20-pad.patch

index a0b714a0121354de72f84b779161c04631955b91..1fe2d1320a9230c39b052a31fa2727b0e5954a85 100644 (file)
@@ -1,5 +1,5 @@
 --- linux/drivers/net/ppp.c.orig       Sun Mar 25 08:31:15 2001
 --- linux/drivers/net/ppp.c.orig       Sun Mar 25 08:31:15 2001
-+++ linux/drivers/net/ppp.c    Tue Mar 19 07:15:40 2002
++++ linux/drivers/net/ppp.c    Mon Mar 25 09:27:28 2002
 @@ -2468,10 +2468,14 @@
            (proto != PPP_LCP)                  &&
            (proto != PPP_CCP)) {
 @@ -2468,10 +2468,14 @@
            (proto != PPP_LCP)                  &&
            (proto != PPP_CCP)) {
                if (new_skb == NULL) {
                        printk(KERN_ERR "ppp_send_frame: no memory\n");
                        kfree_skb(skb);
                if (new_skb == NULL) {
                        printk(KERN_ERR "ppp_send_frame: no memory\n");
                        kfree_skb(skb);
-@@ -2489,12 +2493,25 @@
+@@ -2482,19 +2486,32 @@
+               /* Compress the frame. */
+               new_count = (*ppp->sc_xcomp->compress)
+                       (ppp->sc_xc_state, data, new_skb->data,
+-                       count, ppp->mtu + PPP_HDRLEN);
++                       count, new_skb_size);
+               /* Did it compress? */
+               if (new_count > 0 && (ppp->flags & SC_CCP_UP)) {
                        skb_put(new_skb, new_count);
                        kfree_skb(skb);
                        skb = new_skb;
                        skb_put(new_skb, new_count);
                        kfree_skb(skb);
                        skb = new_skb;