Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Make skb_seq_read unmap the last fragment
  [NET]: Re-enable irqs before pushing pending DMA requests
  [TCP] tcp_read_sock: Allow recv_actor() return return negative error value.
  [PPP]: Fix osize too small errors when decoding mppe.
  [PPP]: Revert 606f585e363527da9feaed79465132c0c661fd9e
  [TIPC]: Fix infinite loop in netlink handler
  [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
  [IPV4]: include sysctl.h from inetdevice.h
  [IPV6] NDISC: Fix thinko to control Router Preference support.
  [NETFILTER]: nfctnetlink: Don't allow to change helper
  [NETFILTER]: nf_conntrack_sip: add missing message types containing RTP info

2 files changed, 17 insertions, 6 deletions

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 541168713f1f..3ef0092dc09c 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1708,7 +1708,18 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
                 goto err;
 
         if (proto == PPP_COMP) {
-                ns = dev_alloc_skb(ppp->mru + PPP_HDRLEN);
+                int obuff_size;
+
+                switch(ppp->rcomp->compress_proto) {
+                case CI_MPPE:
+                        obuff_size = ppp->mru + PPP_HDRLEN + 1;
+                        break;
+                default:
+                        obuff_size = ppp->mru + PPP_HDRLEN;
+                        break;
+                }
+
+                ns = dev_alloc_skb(obuff_size);
                 if (ns == 0) {
                         printk(KERN_ERR "ppp_decompress_frame: no memory\n");
                         goto err;
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index 5ae80bbe2edc..d5bdd2574659 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -493,14 +493,14 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
 
         /*
          * Make sure we have enough room to decrypt the packet.
-         * To account for possible PFC we should only subtract 1
-         * byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD);
-         * However, we assume no PFC, thus subtracting 2 bytes.
+         * Note that for our test we only subtract 1 byte whereas in
+         * mppe_compress() we added 2 bytes (+MPPE_OVHD);
+         * this is to account for possible PFC.
          */
-        if (osize < isize - MPPE_OVHD - 2) {
+        if (osize < isize - MPPE_OVHD - 1) {
                 printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! "
                        "(have: %d need: %d)\n", state->unit,
-                       osize, isize - MPPE_OVHD - 2);
+                       osize, isize - MPPE_OVHD - 1);
                 return DECOMP_ERROR;
         }
         osize = isize - MPPE_OVHD - 2;  /* assume no PFC */