X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=linux%2Fif_pppvar.h;h=3714be0b78dae11d8458d2c6f38668f9257eeb7b;hp=3d0ee88fe12c2dedd67e491570a4031a4d2d60aa;hb=5ad49953840661b898e8dfbb72ff7976c0bbe637;hpb=6589bd3bbe86761cc41767a1400a69bbc985788a diff --git a/linux/if_pppvar.h b/linux/if_pppvar.h index 3d0ee88..3714be0 100644 --- a/linux/if_pppvar.h +++ b/linux/if_pppvar.h @@ -42,7 +42,7 @@ */ /* - * ==FILEVERSION 960302== + * ==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,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? */ + __u32 inuse; /* are we allocated? */ __u8 escape; /* 0x20 if prev char was PPP_ESC*/ __u8 toss; /* toss this frame */ @@ -104,20 +105,18 @@ 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 */ @@ -142,8 +141,8 @@ 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 */ + struct ppp_idle ddinfo; /* demand dial 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 */ };