relatively minor changes for 2.3.2; get rid of max_dev,

use unsigned long in a couple of places

3 files changed, 11 insertions, 12 deletions

diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index ed9dc07..22aa277 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -21,7 +21,7 @@
  */
 
 /*
- *  ==FILEVERSION 970627==
+ *  ==FILEVERSION 971001==
  *
  *  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.1"
+#define PPP_VERSION	"2.3.2"
 #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 3714be0..c1fe88a 100644
--- a/include/linux/if_pppvar.h
+++ b/include/linux/if_pppvar.h
@@ -42,7 +42,7 @@
  */
 
 /*
- *  ==FILEVERSION 970626==
+ *  ==FILEVERSION 971001==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -72,7 +72,7 @@ struct ppp_buffer {
         __s32		count;		/* Count of characters in bufr	*/
         __s32		head;		/* index to head of list	*/
         __s32		tail;		/* index to tail of list	*/
-        __u32		locked;		/* Buffer is being sent		*/
+        unsigned long	locked;		/* Buffer is being sent		*/
         __s32		type;		/* Type of the buffer		*/
 					/* =0, device read buffer	*/
 					/* =1, device write buffer	*/
@@ -94,7 +94,7 @@ struct ppp {
 	struct ppp	*next;		/* unit with next index		*/
 
 	/* Bitmapped flag fields. */
-	__u32		inuse;		/* are we allocated?		*/
+	unsigned long	inuse;		/* are we allocated?		*/
 	__u8		escape;		/* 0x20 if prev char was PPP_ESC*/
 	__u8		toss;		/* toss this frame		*/
 
@@ -123,7 +123,8 @@ struct ppp {
 	struct ppp_buffer *s1buf;	/* Pointer to daemon buffer	*/
 	struct ppp_buffer *s2buf;	/* Pointer to device buffer	*/
 
-	__u32		  last_xmit;	/* time of last transmission	*/
+	unsigned long	last_xmit;	/* time of last transmission	*/
+	unsigned long	last_recv;	/* time last packet received    */
 
   /* These are pointers to the malloc()ed frame buffers.
      These buffers are used while processing a packet.	If a packet
@@ -142,7 +143,6 @@ struct ppp {
 
 	/* Statistic information */
 	struct pppstat	stats;		  /* statistic information	*/
-	struct ppp_idle	ddinfo;		  /* demand dial information	*/
 
 	/* PPP compression protocol information */
 	__u32	sc_bytessent;		  /* count of octets sent */
diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
index 19e1e4b..cc56636 100644
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
@@ -24,11 +24,11 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * From: ppp-comp.h,v 1.7 1995/05/01 01:43:37 paulus Exp
+ * $Id: ppp-comp.h,v 1.6 1997/11/27 06:04:44 paulus Exp $
  */
 
 /*
- *  ==FILEVERSION 970501==
+ *  ==FILEVERSION 971024==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -120,9 +120,8 @@ struct compressor {
  * Don't you just lurve software patents.
  */
 
-#define DECOMP_OK		0	/* no error occured */
-#define DECOMP_ERROR		1	/* error detected before decomp. */
-#define DECOMP_FATALERROR	2	/* error detected after decomp. */
+#define DECOMP_ERROR		-1	/* error detected before decomp. */
+#define DECOMP_FATALERROR	-2	/* error detected after decomp. */
 
 /*
  * CCP codes.