updates for new generic layer

diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index 1d103bdca33156020129dcb41b569db23622960a..6f32ffbb24653e06e236d5d21ffb92f74a3428ec 100644 (file)
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -1,4 +1,4 @@
-/*     $Id: if_ppp.h,v 1.19 1999/03/31 06:07:57 paulus Exp $   */
+/*     $Id: if_ppp.h,v 1.20 1999/07/23 06:53:39 paulus Exp $   */

 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.


@@ -21,7 +21,7 @@
  */
 
 /*
  */
 
 /*

- *  ==FILEVERSION 990331==
+ *  ==FILEVERSION 990717==

  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.


@@ -41,8 +41,6 @@
 
 #define        PPP_MTU         1500    /* Default MTU (size of Info field) */
 #define PPP_MAXMRU     65000   /* Largest MRU we allow */
 
 #define        PPP_MTU         1500    /* Default MTU (size of Info field) */
 #define PPP_MAXMRU     65000   /* Largest MRU we allow */

-#define PPP_VERSION    "2.3.7"
-#define PPP_MAGIC      0x5002  /* Magic value for the ppp structure */

 #define PROTO_IPX      0x002b  /* protocol numbers */
 #define PROTO_DNA_RT    0x0027  /* DNA Routing */
 
 #define PROTO_IPX      0x002b  /* protocol numbers */
 #define PROTO_DNA_RT    0x0027  /* DNA Routing */
 


@@ -60,6 +58,7 @@
 #define SC_CCP_OPEN    0x00000040      /* Look at CCP packets */
 #define SC_CCP_UP      0x00000080      /* May send/recv compressed packets */
 #define SC_ENABLE_IP   0x00000100      /* IP packets may be exchanged */
 #define SC_CCP_OPEN    0x00000040      /* Look at CCP packets */
 #define SC_CCP_UP      0x00000080      /* May send/recv compressed packets */
 #define SC_ENABLE_IP   0x00000100      /* IP packets may be exchanged */

+#define SC_LOOP_TRAFFIC        0x00000200      /* send traffic to pppd */

 #define SC_COMP_RUN    0x00001000      /* compressor has been inited */
 #define SC_DECOMP_RUN  0x00002000      /* decompressor has been inited */
 #define SC_DEBUG       0x00010000      /* enable debug messages */
 #define SC_COMP_RUN    0x00001000      /* compressor has been inited */
 #define SC_DECOMP_RUN  0x00002000      /* decompressor has been inited */
 #define SC_DEBUG       0x00010000      /* enable debug messages */


@@ -68,7 +67,7 @@
 #define SC_LOG_RAWIN   0x00080000      /* log all chars received */
 #define SC_LOG_FLUSH   0x00100000      /* log all chars flushed */
 #define        SC_SYNC         0x00200000      /* synchronous serial mode */
 #define SC_LOG_RAWIN   0x00080000      /* log all chars received */
 #define SC_LOG_FLUSH   0x00100000      /* log all chars flushed */
 #define        SC_SYNC         0x00200000      /* synchronous serial mode */

-#define        SC_MASK         0x0f2000ff      /* bits that user can change */
+#define        SC_MASK         0x0f200fff      /* bits that user can change */

 
 /* state bits */
 #define SC_XMIT_BUSY   0x10000000      /* (used by isdn_ppp?) */
 
 /* state bits */
 #define SC_XMIT_BUSY   0x10000000      /* (used by isdn_ppp?) */


@@ -131,6 +130,9 @@ struct ifpppcstatsreq {
 #define PPPIOCGDEBUG   _IOR('t', 65, int)      /* Read debug level */
 #define PPPIOCSDEBUG   _IOW('t', 64, int)      /* Set debug level */
 #define PPPIOCGIDLE    _IOR('t', 63, struct ppp_idle) /* get idle time */
 #define PPPIOCGDEBUG   _IOR('t', 65, int)      /* Read debug level */
 #define PPPIOCSDEBUG   _IOW('t', 64, int)      /* Set debug level */
 #define PPPIOCGIDLE    _IOR('t', 63, struct ppp_idle) /* get idle time */

+#define PPPIOCNEWUNIT  _IOWR('t', 62, int)     /* create new ppp unit */
+#define PPPIOCATTACH   _IOW('t', 61, int)      /* attach to ppp unit */
+#define PPPIOCDETACH   _IOW('t', 60, int)      /* detach from ppp unit */

 
 #define SIOCGPPPSTATS   (SIOCDEVPRIVATE + 0)
 #define SIOCGPPPVER     (SIOCDEVPRIVATE + 1)   /* NEVER change this!! */
 
 #define SIOCGPPPSTATS   (SIOCDEVPRIVATE + 0)
 #define SIOCGPPPVER     (SIOCDEVPRIVATE + 1)   /* NEVER change this!! */

diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
index 6b26896f82a269451f8886d5a2cdf4955b3bd19b..92aa64572433c5c2cb3cff38162f566f8c143ed3 100644 (file)
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *

- * $Id: ppp-comp.h,v 1.7 1998/03/19 04:56:44 paulus Exp $
+ * $Id: ppp-comp.h,v 1.8 1999/07/23 06:53:40 paulus Exp $

  */
 
 /*
  */
 
 /*


@@ -195,4 +195,9 @@ struct compressor {
 #define CI_PREDICTOR_2         2       /* config option for Predictor-2 */
 #define CILEN_PREDICTOR_2      2       /* length of its config option */
 
 #define CI_PREDICTOR_2         2       /* config option for Predictor-2 */
 #define CILEN_PREDICTOR_2      2       /* length of its config option */
 

+#ifdef __KERNEL__
+extern int ppp_register_compressor(struct compressor *);
+extern void ppp_unregister_compressor(struct compressor *);
+#endif /* __KERNEL__ */
+

 #endif /* _NET_PPP_COMP_H */
 #endif /* _NET_PPP_COMP_H */