1 --- linux/drivers/net/ppp_generic.c.orig Mon Feb 25 11:37:59 2002
2 +++ linux/drivers/net/ppp_generic.c Mon Mar 25 10:19:53 2002
4 /* try to do packet compression */
5 if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state != 0
6 && proto != PPP_LCP && proto != PPP_CCP) {
7 - new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len,
9 + int new_skb_size = ppp->dev->mtu + ppp->dev->hard_header_len;
10 + int compressor_skb_size = ppp->dev->mtu + PPP_HDRLEN;
12 + if (ppp->xcomp->compress_proto == CI_MPPE) {
13 + /* CCP [must have] reduced MTU by MPPE_PAD. */
14 + new_skb_size += MPPE_PAD;
15 + compressor_skb_size += MPPE_PAD;
17 + new_skb = alloc_skb(new_skb_size, GFP_ATOMIC);
19 printk(KERN_ERR "PPP: no memory (comp pkt)\n");
21 @@ -1019,15 +1026,27 @@
22 /* compressor still expects A/C bytes in hdr */
23 len = ppp->xcomp->compress(ppp->xc_state, skb->data - 2,
24 new_skb->data, skb->len + 2,
25 - ppp->dev->mtu + PPP_HDRLEN);
26 + compressor_skb_size);
27 if (len > 0 && (ppp->flags & SC_CCP_UP)) {
31 skb_pull(skb, 2); /* pull off A/C bytes */
33 + } else if (len == 0) {
34 /* didn't compress, or CCP not up yet */
39 + * MPPE requires that we do not send unencrypted
40 + * frames. The compressor will return -1 if we
41 + * should drop the frame. We cannot simply test
42 + * the compress_proto because MPPE and MPPC share
45 + printk(KERN_ERR "ppp: compressor dropped pkt\n");
51 @@ -1515,11 +1534,11 @@
54 if (proto == PPP_COMP) {
55 - ns = dev_alloc_skb(ppp->mru + PPP_HDRLEN);
56 + ns = dev_alloc_skb(ppp->mru + 128 + PPP_HDRLEN);
58 printk(KERN_ERR "ppp_decompress_frame: no memory\n");
61 /* the decompressor still expects the A/C bytes in the hdr */
62 len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2,
63 skb->len + 2, ns->data, ppp->mru + 128 + PPP_HDRLEN);