changes for new linux kernel driver and for multilink

[ppp.git] / include / net / ppp_defs.h

diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
index 0857e4e8b89b343ac7c6b0abf255516f8f1e3c88..4152b069a7061c70af2c7c8ae16b2d9908a776c1 100644 (file)
--- a/include/net/ppp_defs.h
+++ b/include/net/ppp_defs.h
@@ -1,4 +1,4 @@
-/*     $Id: ppp_defs.h,v 1.12 1997/11/27 06:05:49 paulus Exp $ */
+/*     $Id: ppp_defs.h,v 1.14 1999/08/13 01:55:40 paulus Exp $ */
 
 /*
  * ppp_defs.h - PPP definitions.
@@ -77,6 +77,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 */
@@ -94,11 +95,14 @@
 /*
  * A 32-bit unsigned integral type.
  */
-#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) && !defined(__FreeBSD__)
+
+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) \
+ && !defined(__FreeBSD__) && (NS_TARGET < 40)
 #ifdef UINT32_T
 typedef UINT32_T       u_int32_t;
 #else
 typedef unsigned int   u_int32_t;
+typedef unsigned short  u_int16_t;
 #endif
 #endif