X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=linux%2Fif_pppvar.h;h=c1fe88ab40a4625e6a63a992c87eec4af4bf2779;hp=3d0ee88fe12c2dedd67e491570a4031a4d2d60aa;hb=b5c0cf380b11e37f580e6f2affcb78d5ccedade0;hpb=6589bd3bbe86761cc41767a1400a69bbc985788a

diff --git a/linux/if_pppvar.h b/linux/if_pppvar.h
index 3d0ee88..c1fe88a 100644
--- a/linux/if_pppvar.h
+++ b/linux/if_pppvar.h
@@ -42,7 +42,7 @@
  */
 
 /*
- *  ==FILEVERSION 960302==
+ *  ==FILEVERSION 971001==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -72,14 +72,14 @@ 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	*/
 					/* =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,9 +91,10 @@ struct ppp_buffer {
 
 struct ppp {
 	__s32		magic;		/* magic value for structure	*/
+	struct ppp	*next;		/* unit with next index		*/
 
 	/* Bitmapped flag fields. */
-	__u8		inuse;		/* are we allocated?		*/
+	unsigned long	inuse;		/* are we allocated?		*/
 	__u8		escape;		/* 0x20 if prev char was PPP_ESC*/
 	__u8		toss;		/* toss this frame		*/
 
@@ -104,27 +105,26 @@ struct ppp {
 
 	__u32		recv_async_map; /* 1 bit means that given control 
 					   character is ignored on input*/
-	__s32			mtu;	/* maximum xmit frame size	*/
-	__s32			mru;	/* maximum receive frame size	*/
+	__s32		mtu;		/* maximum xmit frame size	*/
+	__s32		mru;		/* maximum receive frame size	*/
 
 	/* Information about the current tty data */
-	__s32			line;		/* PPP channel number	*/
-	struct tty_struct	*tty;		/* ptr to TTY structure	*/
-	__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	*/
+	__s32		line;		/* PPP channel number	*/
+	struct tty_struct *tty;		/* ptr to TTY structure	*/
+	struct tty_struct *backup_tty;	/* TTY to use if tty gets closed */
+	__s32		bytes_sent;	/* Bytes sent on frame	*/
+	__s32		bytes_rcvd;	/* Bytes recvd on frame	*/
 
 	/* VJ Header compression data */
-	struct slcompress	*slcomp; /* for header compression	*/
+	struct slcompress *slcomp;	/* for header compression	*/
 
 	/* Transmission information */
 	struct ppp_buffer *xbuf;	/* Buffer currently being sent	*/
 	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,8 +142,7 @@ struct ppp {
 	struct wait_queue *read_wait;	  /* queue for writing processes */
 
 	/* Statistic information */
-	struct pppstat	      stats;	  /* statistic information	*/
-	struct ppp_idle	      ddinfo;	  /* demand dial information	*/
+	struct pppstat	stats;		  /* statistic information	*/
 
 	/* PPP compression protocol information */
 	__u32	sc_bytessent;		  /* count of octets sent */
@@ -154,4 +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 */
 };