X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=include%2Flinux%2Fif_ppp.h;h=f4568decb2ecb0f8c823f989e634e01af3470cf8;hp=5f21d9447d886749c069caa9423a3ddb184c1cca;hb=463cf57abda4845c8fbc01fd7c804aed1f30e758;hpb=0f61ac5460e89dd768f1fb56fbdd8fa6f8af79f1

diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index 5f21d94..f4568de 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -1,4 +1,4 @@
-/*	$Id: if_ppp.h,v 1.4 1995/12/18 03:38:01 paulus Exp $	*/
+/*	$Id: if_ppp.h,v 1.12 1998/03/31 23:47:07 paulus Exp $	*/
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
@@ -21,10 +21,10 @@
  */
 
 /*
- *  ==FILEVERSION 6==
+ *  ==FILEVERSION 980331==
  *
  *  NOTE TO MAINTAINERS:
- *     If you modify this file at all, increment the number above.
+ *     If you modify this file at all, please set the above date.
  *     if_ppp.h is shipped with a PPP distribution as well as with the kernel;
  *     if everyone increases the FILEVERSION number above, then scripts
  *     can do the right thing when deciding whether to install a new if_ppp.h
@@ -35,19 +35,13 @@
 #ifndef _IF_PPP_H_
 #define _IF_PPP_H_
 
-#if defined(__linux__)
-#include <linux/if.h>
-#include <linux/ioctl.h>
-#include <linux/ppp_defs.h>
-#endif
-
 /*
  * Packet sizes
  */
 
 #define	PPP_MTU		1500	/* Default MTU (size of Info field) */
 #define PPP_MAXMRU	65000	/* Largest MRU we allow */
-#define PPP_VERSION	"2.2.0"
+#define PPP_VERSION	"2.3.3"
 #define PPP_MAGIC	0x5002	/* Magic value for the ppp structure */
 #define PROTO_IPX	0x002b	/* protocol numbers */
 #define PROTO_DNA_RT    0x0027  /* DNA Routing */
@@ -65,7 +59,6 @@
 #define SC_REJ_COMP_TCP	0x00000020	/* reject TCP (VJ) comp. on input */
 #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_COMP_RUN	0x00001000	/* compressor has been inited */
 #define SC_DECOMP_RUN	0x00002000	/* decompressor has been inited */
 #define SC_DEBUG	0x00010000	/* enable debug messages */
@@ -73,12 +66,9 @@
 #define SC_LOG_OUTPKT	0x00040000	/* log contents of pkts sent */
 #define SC_LOG_RAWIN	0x00080000	/* log all chars received */
 #define SC_LOG_FLUSH	0x00100000	/* log all chars flushed */
-#define	SC_MASK		0x0fE0ffff	/* bits that user can change */
+#define	SC_MASK		0x0f0000ff	/* bits that user can change */
 
 /* state bits */
-#define	SC_ESCAPED	0x80000000	/* saw a PPP_ESCAPE */
-#define	SC_FLUSH	0x40000000	/* flush input until next PPP_FLAG */
-#define SC_VJ_RESET	0x20000000	/* Need to reset the VJ decompressor */
 #define SC_XMIT_BUSY	0x10000000	/* ppp_write_wakeup is active */
 #define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
 #define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
@@ -92,14 +82,14 @@
  */
 
 struct npioctl {
-    int		protocol;	/* PPP procotol, e.g. PPP_IP */
+    int		protocol;	/* PPP protocol, e.g. PPP_IP */
     enum NPmode	mode;
 };
 
 /* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
 struct ppp_option_data {
-	u_char	*ptr;
-	u_int	length;
+	__u8	*ptr;
+	__u32	length;
 	int	transmit;
 };