changes for new linux kernel driver and for multilink

diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index 6f32ffbb24653e06e236d5d21ffb92f74a3428ec..a03f3f2ae64901bffb36acdb40687860c99f541b 100644 (file)
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -1,4 +1,4 @@
-/*     $Id: if_ppp.h,v 1.20 1999/07/23 06:53:39 paulus Exp $   */
+/*     $Id: if_ppp.h,v 1.21 2000/03/27 06:03:36 paulus Exp $   */
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
@@ -21,7 +21,7 @@
  */
 
 /*
- *  ==FILEVERSION 990717==
+ *  ==FILEVERSION 20000324==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -59,8 +59,11 @@
 #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_MULTILINK   0x00000400      /* do multilink encapsulation */
+#define SC_MP_SHORTSEQ 0x00000800      /* use short MP sequence numbers */
 #define SC_COMP_RUN    0x00001000      /* compressor has been inited */
 #define SC_DECOMP_RUN  0x00002000      /* decompressor has been inited */
+#define SC_MP_XSHORTSEQ        0x00004000      /* transmit short MP seq numbers */
 #define SC_DEBUG       0x00010000      /* enable debug messages */
 #define SC_LOG_INPKT   0x00020000      /* log contents of good pkts recvd */
 #define SC_LOG_OUTPKT  0x00040000      /* log contents of pkts sent */
@@ -132,7 +135,12 @@ struct ifpppcstatsreq {
 #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 PPPIOCDETACH   _IOW('t', 60, int)      /* detach from ppp unit/chan */
+#define PPPIOCSMRRU    _IOW('t', 59, int)      /* set multilink MRU */
+#define PPPIOCCONNECT  _IOW('t', 58, int)      /* connect channel to unit */
+#define PPPIOCDISCONN  _IO('t', 57)            /* disconnect channel */
+#define PPPIOCATTCHAN  _IOW('t', 56, int)      /* attach to ppp channel */
+#define PPPIOCGCHAN    _IOR('t', 55, int)      /* get ppp channel number */
 
 #define SIOCGPPPSTATS   (SIOCDEVPRIVATE + 0)
 #define SIOCGPPPVER     (SIOCDEVPRIVATE + 1)   /* NEVER change this!! */

diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 2e6d9d1fa773cb1bb92bb88b44add0fe10f7eacd..e390c569bdf131359817aa0caf73ae78dc6f948d 100644 (file)
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -1,4 +1,4 @@
-/*     $Id: ppp_defs.h,v 1.8 1999/02/26 06:48:21 paulus Exp $  */
+/*     $Id: ppp_defs.h,v 1.9 2000/03/27 06:03:36 paulus Exp $  */
 
 /*
  * ppp_defs.h - PPP definitions.
@@ -28,7 +28,7 @@
  */
 
 /*
- *  ==FILEVERSION 990114==
+ *  ==FILEVERSION 20000114==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -70,12 +70,15 @@
 #define PPP_IPX                0x2b    /* IPX protocol */
 #define        PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
 #define        PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */
+#define PPP_MP         0x3d    /* Multilink protocol */
 #define PPP_IPV6       0x57    /* Internet Protocol Version 6 */
+#define PPP_COMPFRAG   0xfb    /* fragment compressed below bundle */
 #define PPP_COMP       0xfd    /* compressed packet */
 #define PPP_IPCP       0x8021  /* IP Control Protocol */
 #define PPP_ATCP       0x8029  /* AppleTalk Control Protocol */
 #define PPP_IPXCP      0x802b  /* IPX Control Protocol */
 #define PPP_IPV6CP     0x8057  /* IPv6 Control Protocol */
+#define PPP_CCPFRAG    0x80fb  /* CCP at link level (below MP bundle) */
 #define PPP_CCP                0x80fd  /* Compression Control Protocol */
 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */