Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / linux / ppp-comp.h

diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
index 7227e653b3beacdb7e496196e86b08f821671772..e86a7a5cf355ce3135e3351f9bec314fbbb24b24 100644 (file)
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
@@ -111,6 +111,8 @@ struct compressor {
 
        /* Used in locking compressor modules */
        struct module *owner;
+       /* Extra skb space needed by the compressor algorithm */
+       unsigned int comp_extra;
 };
 
 /*
@@ -190,6 +192,13 @@ struct compressor {
 #define DEFLATE_MAKE_OPT(w)    ((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
 #define DEFLATE_CHK_SEQUENCE   0
 
+/*
+ * Definitions for MPPE.
+ */
+
+#define CI_MPPE                18      /* config option for MPPE */
+#define CILEN_MPPE              6      /* length of config option */
+
 /*
  * Definitions for other, as yet unsupported, compression methods.
  */