up to 2.3.9 now

[ppp.git] / include / linux / if_pppvar.h

diff --git a/include/linux/if_pppvar.h b/include/linux/if_pppvar.h
index cf70fe655ea1dba5f311876f59600255575b3ade..69195255fe1bea828601794e34b676959e3ac49f 100644 (file)
--- a/include/linux/if_pppvar.h
+++ b/include/linux/if_pppvar.h
@@ -42,7 +42,7 @@
  */
 
 /*
- *  ==FILEVERSION 980704==
+ *  ==FILEVERSION 990813==
  *
  *  NOTE TO MAINTAINERS:
  *   If you modify this file at all, please set the above date.
@@ -61,7 +61,8 @@
 #define NP_IP  0               /* Internet Protocol */
 #define NP_IPX 1               /* IPX protocol */
 #define NP_AT  2               /* Appletalk protocol */
-#define NUM_NP 3               /* Number of NPs. */
+#define NP_IPV6        3               /* Internet Protocol */
+#define NUM_NP 4               /* Number of NPs. */
 
 #define OBUFSIZE       256     /* # chars of output buffering */
 
@@ -80,6 +81,7 @@ struct ppp {
        struct slcompress *slcomp;      /* for TCP header compression   */
        struct sk_buff_head xmt_q;      /* frames to send from pppd     */
        struct sk_buff_head rcv_q;      /* frames for pppd to read      */
+       unsigned long   xmit_busy;      /* bit 0 set when xmitter busy  */
 
        /* Information specific to using ppp on async serial lines. */
        struct tty_struct *tty;         /* ptr to TTY structure */
@@ -87,6 +89,7 @@ struct ppp {
        __u8            escape;         /* 0x20 if prev char was PPP_ESC */
        __u8            toss;           /* toss this frame              */
        volatile __u8   tty_pushing;    /* internal state flag          */
+       volatile __u8   woke_up;        /* internal state flag          */
        __u32           xmit_async_map[8]; /* 1 bit means that given control 
                                           character is quoted on output*/
        __u32           recv_async_map; /* 1 bit means that given control 
@@ -130,3 +133,6 @@ struct ppp {
        /* tty output buffer */
        unsigned char   obuf[OBUFSIZE]; /* buffer for characters to send */
 };
+
+#define PPP_MAGIC      0x5002
+#define PPP_VERSION    "2.3.9"