update for 2.3.11

[ppp.git] / linux / ppp.c

diff --git a/linux/ppp.c b/linux/ppp.c
index 3a2b377f0b833d23612d082dcfd08a85238b1415..0fa98fd1eebffd00101716061106ed3f8a0f342a 100644 (file)
--- a/linux/ppp.c
+++ b/linux/ppp.c
@@ -4,7 +4,7 @@
  *  Al Longyear <longyear@netcom.com>
  *  Extensively rewritten by Paul Mackerras <paulus@cs.anu.edu.au>
  *
- *  ==FILEVERSION 990510==
+ *  ==FILEVERSION 990910==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the number above to the
@@ -45,7 +45,7 @@
 
 #define PPP_MAX_RCV_QLEN       32      /* max # frames we queue up for pppd */
 
-/* $Id: ppp.c,v 1.27 1999/05/13 00:35:57 paulus Exp $ */
+/* $Id: ppp.c,v 1.33 1999/12/23 01:48:45 paulus Exp $ */
 
 #include <linux/version.h>
 #include <linux/config.h>
@@ -104,7 +104,7 @@
 #endif
 
 #undef PPP_VERSION
-#define PPP_VERSION    "2.3.8"
+#define PPP_VERSION    "2.3.11"
 
 #if LINUX_VERSION_CODE >= VERSION(2,1,4)
 
@@ -182,10 +182,8 @@ typedef size_t             rw_count_t;
  * Local functions
  */
 
-#ifdef CONFIG_MODULES
 static int ppp_register_compressor (struct compressor *cp);
 static void ppp_unregister_compressor (struct compressor *cp);
-#endif
 
 static void ppp_async_init(struct ppp *ppp);
 static void ppp_async_release(struct ppp *ppp);
@@ -343,7 +341,9 @@ __u16 ppp_crc16_table[256] =
        0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
        0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
 };
+#if LINUX_VERSION_CODE >= VERSION(2,1,18)
 EXPORT_SYMBOL(ppp_crc16_table);
+#endif
 
 #ifdef CHECK_CHARACTERS
 static __u32 paritytab[8] =
@@ -1963,6 +1963,9 @@ ppp_ioctl(struct ppp *ppp, unsigned int param2, unsigned long param3)
                        break;
 
                switch (npi.protocol) {
+               case PPP_IPV6:
+                       npi.protocol = NP_IPV6;
+                       break;
                case PPP_IP:
                        npi.protocol = NP_IP;
                        break;
@@ -3249,7 +3252,6 @@ static struct compressor *find_compressor (int type)
        return (struct compressor *) 0;
 }
 
-#ifdef CONFIG_MODULES
 static int ppp_register_compressor (struct compressor *cp)
 {
        struct compressor_link *new;
@@ -3302,7 +3304,6 @@ static void ppp_unregister_compressor (struct compressor *cp)
        }
        restore_flags(flags);
 }
-#endif
 
 /*************************************************************
  * Module support routines