X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=svr4%2Fppp_mod.c;h=c0473b667a5a4a2996a7914224f6e54605011335;hb=da7530a7e013e1d08982168c897f1d0ea2b8829d;hp=3da939709112170216788d00f064cb31e528f70a;hpb=ad96e2b66e32479175852c3df53a7bfc971fe7a9;p=ppp.git

diff --git a/svr4/ppp_mod.c b/svr4/ppp_mod.c
index 3da9397..c0473b6 100644
--- a/svr4/ppp_mod.c
+++ b/svr4/ppp_mod.c
@@ -1,30 +1,38 @@
 /*
  * ppp_mod.c - modload support for PPP pseudo-device driver.
  *
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
+ * Copyright (c) 1994 Paul Mackerras. All rights reserved.
  *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
  *
- * $Id: ppp_mod.c,v 1.2 1996/01/18 03:27:36 paulus Exp $
+ * 3. The name(s) of the authors of this software must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission.
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Paul Mackerras
+ *     <paulus@samba.org>".
+ *
+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * 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.4 2002/12/06 09:49:16 paulus Exp $
  */
 
 /*
@@ -37,6 +45,7 @@
 #include <sys/conf.h>
 #include <sys/modctl.h>
 #include <sys/sunddi.h>
+#include <sys/ksynch.h>
 
 #ifdef __STDC__
 #define __P(x)	x
@@ -50,6 +59,7 @@ 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 **));
 
 extern struct streamtab pppinfo;
+extern krwlock_t ppp_lower_lock;
 
 static dev_info_t *ppp_dip;
 
@@ -131,6 +141,7 @@ ppp_attach(dip, cmd)
 	ddi_remove_minor_node(dip, NULL);
 	return DDI_FAILURE;
     }
+    rw_init(&ppp_lower_lock, NULL, RW_DRIVER, NULL);
     return DDI_SUCCESS;
 }
 
@@ -139,6 +150,7 @@ ppp_detach(dip, cmd)
     dev_info_t *dip;
     ddi_detach_cmd_t cmd;
 {
+    rw_destroy(&ppp_lower_lock);
     ddi_remove_minor_node(dip, NULL);
     return DDI_SUCCESS;
 }