[src/trunk]: src/sys/net Merge if_spppsubr.c PPP protocol declarations list w...

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cda20faea7e4
branches:  trunk
changeset: 494134:cda20faea7e4
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Jul 02 17:38:09 2000 +0000

description:
Merge if_spppsubr.c PPP protocol declarations list with the one found
in ppp_defs.h, and have if_spppsubr.c include ppp_defs.h rather than
duplicate its definitions.

[This is a stopgap measure to clean up build lossage.]

diffstat:

 sys/net/if_spppsubr.c |  16 ++--------------
 sys/net/ppp_defs.h    |  38 ++++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diffs (89 lines):

diff -r d27dc0f65aba -r cda20faea7e4 sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c     Sun Jul 02 17:35:00 2000 +0000
+++ b/sys/net/if_spppsubr.c     Sun Jul 02 17:38:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr.c,v 1.10 2000/05/16 05:45:27 itojun Exp $   */
+/*     $NetBSD: if_spppsubr.c,v 1.11 2000/07/02 17:38:09 sommerfeld Exp $       */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -57,6 +57,7 @@
 #include <net/netisr.h>
 #include <net/if_types.h>
 #include <net/route.h>
+#include <net/ppp_defs.h>
 
 #include <machine/stdarg.h>
 
@@ -127,19 +128,6 @@
 #define IFF_PASSIVE    IFF_LINK0       /* wait passively for connection */
 #define IFF_AUTO       IFF_LINK1       /* auto-dial on output */
 
-#define PPP_ALLSTATIONS 0xff           /* All-Stations broadcast address */
-#define PPP_UI         0x03            /* Unnumbered Information */
-#define PPP_IP         0x0021          /* Internet Protocol */
-#define PPP_ISO                0x0023          /* ISO OSI Protocol */
-#define PPP_XNS                0x0025          /* Xerox NS Protocol */
-#define PPP_IPX                0x002b          /* Novell IPX Protocol */
-#define PPP_IPV6       0x0057          /* Internet Protocol version 6 */
-#define PPP_LCP                0xc021          /* Link Control Protocol */
-#define PPP_PAP                0xc023          /* Password Authentication Protocol */
-#define PPP_CHAP       0xc223          /* Challenge-Handshake Auth Protocol */
-#define PPP_IPCP       0x8021          /* Internet Protocol Control Protocol */
-#define PPP_IPV6CP     0x8057          /* IPv6 Control Protocol */
-
 #define CONF_REQ       1               /* PPP configure request */
 #define CONF_ACK       2               /* PPP configure acknowledge */
 #define CONF_NAK       3               /* PPP configure negative ack */
diff -r d27dc0f65aba -r cda20faea7e4 sys/net/ppp_defs.h
--- a/sys/net/ppp_defs.h        Sun Jul 02 17:35:00 2000 +0000
+++ b/sys/net/ppp_defs.h        Sun Jul 02 17:38:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ppp_defs.h,v 1.6 1999/07/01 08:12:49 itojun Exp $      */
+/*     $NetBSD: ppp_defs.h,v 1.7 2000/07/02 17:38:09 sommerfeld Exp $  */
 /*     Id: ppp_defs.h,v 1.11 1997/04/30 05:46:24 paulus Exp    */
 
 /*
@@ -68,23 +68,25 @@
 /*
  * Protocol field values.
  */
-#define PPP_IP         0x21    /* Internet Protocol */
-#define PPP_AT         0x29    /* AppleTalk Protocol */
-#define PPP_IPX                0x2b    /* IPX protocol */
-#define        PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
-#define        PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */
-#define PPP_IPV6       0x57    /* Internet Protocol Version 6 */
-#define PPP_COMP       0xfd    /* compressed packet */
-#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 */
-#define PPP_LQR                0xc025  /* Link Quality Report protocol */
-#define PPP_CHAP       0xc223  /* Cryptographic Handshake Auth. Protocol */
-#define PPP_CBCP       0xc029  /* Callback Control Protocol */
+#define PPP_IP         0x0021          /* Internet Protocol */
+#define PPP_ISO                0x0023          /* ISO OSI Protocol */
+#define PPP_XNS                0x0025          /* Xerox NS Protocol */
+#define PPP_AT         0x0029          /* AppleTalk Protocol */
+#define PPP_IPX                0x002b          /* IPX protocol */
+#define        PPP_VJC_COMP    0x002d          /* VJ compressed TCP */
+#define        PPP_VJC_UNCOMP  0x002f          /* VJ uncompressed TCP */
+#define PPP_IPV6       0x0057          /* Internet Protocol Version 6 */
+#define PPP_COMP       0x00fd          /* compressed packet */
+#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 */
+#define PPP_LQR                0xc025          /* Link Quality Report protocol */
+#define PPP_CHAP       0xc223          /* Crypto Handshake Auth. Protocol */
+#define PPP_CBCP       0xc029          /* Callback Control Protocol */
 
 /*
  * Values for FCS calculations.