Rename rp-pppoe.so plugin to pppoe.so

[ppp.git] / solaris / ppp_mod.c

diff --git a/solaris/ppp_mod.c b/solaris/ppp_mod.c
index 8419b3747bd2a0c316309ce5590fdf487072700c..d1bf0251a4ec82c8b5d3a47e91d3884eac247cc9 100644 (file)
--- a/solaris/ppp_mod.c
+++ b/solaris/ppp_mod.c
@@ -32,7 +32,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ppp_mod.c,v 1.2 2002/12/06 09:49:16 paulus Exp $
+ * $Id: ppp_mod.c,v 1.3 2004/01/17 05:47:55 carlsonj Exp $
  */
 
 /*
@@ -47,16 +47,10 @@
 #include <sys/sunddi.h>
 #include <sys/ksynch.h>
 
-#ifdef __STDC__
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif
-
-static int ppp_identify __P((dev_info_t *));
-static int ppp_attach __P((dev_info_t *, ddi_attach_cmd_t));
-static int ppp_detach __P((dev_info_t *, ddi_detach_cmd_t));
-static int ppp_devinfo __P((dev_info_t *, ddi_info_cmd_t, void *, void **));
+static int ppp_identify(dev_info_t *);
+static int ppp_attach(dev_info_t *, ddi_attach_cmd_t);
+static int ppp_detach(dev_info_t *, ddi_detach_cmd_t);
+static int ppp_devinfo(dev_info_t *, ddi_info_cmd_t, void *, void **);
 
 extern struct streamtab pppinfo;
 extern krwlock_t ppp_lower_lock;
@@ -91,7 +85,7 @@ static struct dev_ops ppp_ops = {
 
 static struct modldrv modldrv = {
     &mod_driverops,                    /* says this is a pseudo driver */
-    "PPP-2.3 multiplexing driver",
+    "PPP-2.4.7 multiplexing driver",
     &ppp_ops                           /* driver ops */
 };
 
@@ -124,8 +118,13 @@ static int
 ppp_identify(dip)
     dev_info_t *dip;
 {
+    /* This entry point is not used as of Solaris 10 */
+#ifdef DDI_IDENTIFIED
     return strcmp(ddi_get_name(dip), "ppp") == 0? DDI_IDENTIFIED:
        DDI_NOT_IDENTIFIED;
+#else
+    return 0;
+#endif
 }
 
 static int