From 8ad33f2ec9e0cc770f9eda053d568a38a1ac1972 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Fri, 26 Feb 1999 06:48:21 +0000
Subject: Fix it for 2.0.x kernels; import updates from 2.2.x including ipv6
 stuff; change if_ppp.h so pppd can compile with glibc 2.1

---
 include/linux/if_ppp.h    | 6 +++---
 include/linux/if_pppvar.h | 5 +++--
 include/linux/ppp_defs.h  | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index 8456c7e..74248ed 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -1,4 +1,4 @@
-/*	$Id: if_ppp.h,v 1.15 1999/01/19 23:57:43 paulus Exp $	*/
+/*	$Id: if_ppp.h,v 1.16 1999/02/26 06:48:20 paulus Exp $	*/
 
 /*
  * if_ppp.h - Point-to-Point Protocol definitions.
@@ -21,7 +21,7 @@
  */
 
 /*
- *  ==FILEVERSION 980704==
+ *  ==FILEVERSION 990226==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -35,7 +35,7 @@
 #ifndef _IF_PPP_H_
 #define _IF_PPP_H_
 
-#if defined(__linux__)
+#if defined(__KERNEL__)
 #include <linux/if.h>
 #include <linux/ioctl.h>
 #include <linux/ppp_defs.h>
diff --git a/include/linux/if_pppvar.h b/include/linux/if_pppvar.h
index a85b33c..6fae4b9 100644
--- a/include/linux/if_pppvar.h
+++ b/include/linux/if_pppvar.h
@@ -42,7 +42,7 @@
  */
 
 /*
- *  ==FILEVERSION 981004==
+ *  ==FILEVERSION 990114==
  *
  *  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 */
 
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 424b22b..2e6d9d1 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -1,4 +1,4 @@
-/*	$Id: ppp_defs.h,v 1.7 1997/07/14 03:50:51 paulus Exp $	*/
+/*	$Id: ppp_defs.h,v 1.8 1999/02/26 06:48:21 paulus Exp $	*/
 
 /*
  * ppp_defs.h - PPP definitions.
@@ -28,7 +28,7 @@
  */
 
 /*
- *  ==FILEVERSION 970607==
+ *  ==FILEVERSION 990114==
  *
  *  NOTE TO MAINTAINERS:
  *     If you modify this file at all, please set the above date.
@@ -75,6 +75,7 @@
 #define PPP_IPCP	0x8021	/* IP Control Protocol */
 #define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */
 #define PPP_IPXCP	0x802b	/* IPX Control Protocol */
+#define PPP_IPV6CP	0x8057	/* IPv6 Control Protocol */
 #define PPP_CCP		0x80fd	/* Compression Control Protocol */
 #define PPP_LCP		0xc021	/* Link Control Protocol */
 #define PPP_PAP		0xc023	/* Password Authentication Protocol */
-- 
cgit v1.2.1