bug fixes and restructuring

3 files changed, 10 insertions, 9 deletions

diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index e4aaf88..ed9dc07 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -21,7 +21,7 @@
  */
 
 /*
- *  ==FILEVERSION 960926==
+ *  ==FILEVERSION 970627==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -47,7 +47,7 @@
 
 #define	PPP_MTU		1500	/* Default MTU (size of Info field) */
 #define PPP_MAXMRU	65000	/* Largest MRU we allow */
-#define PPP_VERSION	"2.3.0"
+#define PPP_VERSION	"2.3.1"
 #define PPP_MAGIC	0x5002	/* Magic value for the ppp structure */
 #define PROTO_IPX	0x002b	/* protocol numbers */
 #define PROTO_DNA_RT    0x0027  /* DNA Routing */
diff --git a/include/linux/if_pppvar.h b/include/linux/if_pppvar.h
index ea02f86..3714be0 100644
--- a/include/linux/if_pppvar.h
+++ b/include/linux/if_pppvar.h
@@ -42,7 +42,7 @@
  */
 
 /*
- *  ==FILEVERSION 960918==
+ *  ==FILEVERSION 970626==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -79,7 +79,7 @@ struct ppp_buffer {
 					/* =2, daemon write buffer	*/
 					/* =3, daemon read buffer	*/
         __u16		fcs;		/* Frame Check Sequence (CRC)	*/
-        __u8		filler[4];	/* Extra space if needed	*/
+        __u16		magic;		/* Extra space if needed	*/
 };
 
 /* Given a pointer to the ppp_buffer then return base address of buffer */
@@ -91,6 +91,7 @@ struct ppp_buffer {
 
 struct ppp {
 	__s32		magic;		/* magic value for structure	*/
+	struct ppp	*next;		/* unit with next index		*/
 
 	/* Bitmapped flag fields. */
 	__u32		inuse;		/* are we allocated?		*/
@@ -114,9 +115,6 @@ struct ppp {
 	__s32		bytes_sent;	/* Bytes sent on frame	*/
 	__s32		bytes_rcvd;	/* Bytes recvd on frame	*/
 
-	/* Interface to the network layer */
-	struct device	*dev;		/* easy for intr handling	*/
-
 	/* VJ Header compression data */
 	struct slcompress *slcomp;	/* for header compression	*/
 
@@ -155,5 +153,7 @@ struct ppp {
 	struct	compressor *sc_rcomp;	  /* receive decompressor */
 	void	*sc_rc_state;		  /* receive decompressor state */
 	__s32	 sc_xfer;		  /* PID of reserved PPP table */
+	char	name[8];
+	struct device	dev;		/* net device structure */
 	struct enet_statistics estats;	/* more detailed stats */
 };
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index bede3bf..424b22b 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -1,4 +1,4 @@
-/*	From: ppp_defs.h,v 1.2 1994/09/21 01:31:06 paulus Exp	*/
+/*	$Id: ppp_defs.h,v 1.7 1997/07/14 03:50:51 paulus Exp $	*/
 
 /*
  * ppp_defs.h - PPP definitions.
@@ -28,7 +28,7 @@
  */
 
 /*
- *  ==FILEVERSION 970501==
+ *  ==FILEVERSION 970607==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -70,6 +70,7 @@
 #define PPP_IPX		0x2b	/* IPX protocol */
 #define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
 #define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
+#define PPP_IPV6	0x57	/* Internet Protocol Version 6 */
 #define PPP_COMP	0xfd	/* compressed packet */
 #define PPP_IPCP	0x8021	/* IP Control Protocol */
 #define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */