patch-2.1.76 linux/include/linux/if_pppvar.h

Next file: linux/include/linux/pci.h
Previous file: linux/include/linux/if_ppp.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.75/linux/include/linux/if_pppvar.h linux/include/linux/if_pppvar.h
@@ -1,4 +1,4 @@
-/*	$Id: if_pppvar.h,v 1.4 1997/09/03 11:55:06 ecd Exp $	*/
+/*	From: if_pppvar.h,v 1.2 1995/06/12 11:36:51 paulus Exp */
 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *
@@ -42,7 +42,7 @@
  */
 
 /*
- *  ==FILEVERSION 960302==
+ *  ==FILEVERSION 971001==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -79,7 +79,7 @@
 					/* =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 {
 	__s32		magic;		/* magic value for structure	*/
+	struct ppp	*next;		/* unit with next index		*/
 
 	/* Bitmapped flag fields. */
 	unsigned long	inuse;		/* are we allocated?		*/
@@ -104,27 +105,26 @@
 
 	__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 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	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 */
 };

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov