mention modules.conf as well as conf.modules

[ppp.git] / pppd / sys-svr4.c

diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c
index 50c32033995cc7b9311e386d6598deb276ef06b5..859ab2ad3ab3422bf749048aced42f4f573753f6 100644 (file)
--- a/pppd/sys-svr4.c
+++ b/pppd/sys-svr4.c
@@ -25,7 +25,7 @@
  * OR MODIFICATIONS.
  */
 
-#define RCSID  "$Id: sys-svr4.c,v 1.36 1999/10/08 01:09:03 masputra Exp $"
+#define RCSID  "$Id: sys-svr4.c,v 1.38 1999/11/13 19:19:17 masputra Exp $"
 
 #include <limits.h>
 #include <stdio.h>
@@ -98,7 +98,17 @@
 
 static const char rcsid[] = RCSID;
 
-static         char *mux_dev_name;
+#if defined(SOL2)
+/*
+ * "/dev/udp" is used as a multiplexor to PLINK the interface stream
+ * under. It is used in place of "/dev/ip" since STREAMS will not let
+ * a driver be PLINK'ed under itself, and "/dev/ip" is typically the
+ * driver at the bottom of the tunneling interfaces stream.
+ */
+static char *mux_dev_name = UDP_DEV_NAME;
+#else
+static char *mux_dev_name = IP_DEV_NAME;
+#endif
 static int     pppfd;
 static int     fdmuxid = -1;
 static int     ipfd;
@@ -364,18 +374,6 @@ sys_init()
     } reply;
 #endif /* !defined(SOL2) */
 
-#if defined(SOL2)
-    /*
-     * "/dev/udp" is used as a multiplexor to PLINK the interface stream
-     * under. It is used in place of "/dev/ip" since STREAMS will not let
-     * a driver be PLINK'ed under itself, and "/dev/ip" is typically the
-     * driver at the bottom of the tunneling interfaces stream.
-     */
-    mux_dev_name = UDP_DEV_NAME;
-#else
-    mux_dev_name = IP_DEV_NAME;
-#endif
-
     ipfd = open(mux_dev_name, O_RDWR, 0);
     if (ipfd < 0)
        fatal("Couldn't open IP device: %m");
@@ -494,7 +492,7 @@ sys_init()
     ifr.ifr_ip_muxid = ipmuxid;
 
     /*
-     * In Sol 8 and later, STREAMS dynamic module plumbing feature exits.
+     * In Sol 8 and later, STREAMS dynamic module plumbing feature exists.
      * This is so that an arbitrary module can be inserted, or deleted, 
      * between ip module and the device driver without tearing down the 
      * existing stream. Such feature requires the mux ids, which is set 
@@ -892,6 +890,18 @@ struct speed {
 #endif
 #ifdef B115200
     { 115200, B115200 },
+#endif
+#ifdef B153600
+    { 153600, B153600 },
+#endif
+#ifdef B230400
+    { 230400, B230400 },
+#endif
+#ifdef B307200
+    { 307200, B307200 },
+#endif
+#ifdef B460800
+    { 460800, B460800 },
 #endif
     { 0, 0 }
 };