X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=linux%2Fppp.c;h=0fa98fd1eebffd00101716061106ed3f8a0f342a;hb=fecefef95ccdad604afe51f954f1e25861f022e6;hp=014da48d254b28e4fdfcdfdbf5e21c9e4c288706;hpb=16d79b04fe2f0cfa2accd1f1d414e392fca2230d;p=ppp.git

diff --git a/linux/ppp.c b/linux/ppp.c
index 014da48..0fa98fd 100644
--- 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.28 1999/05/14 01:07: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);
@@ -1965,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;
@@ -3251,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;
@@ -3304,7 +3304,6 @@ static void ppp_unregister_compressor (struct compressor *cp)
 	}
 	restore_flags(flags);
 }
-#endif
 
 /*************************************************************
  * Module support routines