xnu-792.12.6.tar.gz

[apple/xnu.git] / bsd / net / dlil.c

diff --git a/bsd/net/dlil.c b/bsd/net/dlil.c
index 4b24b76f9355c717afdb782ad302b456e89a2251..4eb62bc6556ba7b505712eca1a00324befc20149 100644 (file)
--- a/bsd/net/dlil.c
+++ b/bsd/net/dlil.c
@@ -1,23 +1,31 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * This file contains Original Code and/or Modifications of Original Code 
+ * as defined in and that are subject to the Apple Public Source License 
+ * Version 2.0 (the 'License'). You may not use this file except in 
+ * compliance with the License.  The rights granted to you under the 
+ * License may not be used to create, or enable the creation or 
+ * redistribution of, unlawful or unlicensed copies of an Apple operating 
+ * system, or to circumvent, violate, or enable the circumvention or 
+ * violation of, any terms of an Apple operating system software license 
+ * agreement.
+ *
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@

  */
 /*
  *     Copyright (c) 1999 Apple Computer, Inc. 
  */
 /*
  *     Copyright (c) 1999 Apple Computer, Inc. 


@@ -551,6 +559,7 @@ dlil_init(void)
        
        /* Setup the lock groups we will use */
        grp_attributes = lck_grp_attr_alloc_init();
        
        /* Setup the lock groups we will use */
        grp_attributes = lck_grp_attr_alloc_init();

+       lck_grp_attr_setdefault(grp_attributes);

 
        dlil_lock_group = lck_grp_alloc_init("dlil internal locks", grp_attributes);
 #if IFNET_RW_LOCK
 
        dlil_lock_group = lck_grp_alloc_init("dlil internal locks", grp_attributes);
 #if IFNET_RW_LOCK


@@ -565,8 +574,10 @@ dlil_init(void)
        
        /* Setup the lock attributes we will use */
        lck_attributes = lck_attr_alloc_init();
        
        /* Setup the lock attributes we will use */
        lck_attributes = lck_attr_alloc_init();

+       lck_attr_setdefault(lck_attributes);

        
        ifnet_lock_attr = lck_attr_alloc_init();
        
        ifnet_lock_attr = lck_attr_alloc_init();

+       lck_attr_setdefault(ifnet_lock_attr);

        
        dlil_input_lock = lck_spin_alloc_init(input_lock_grp, lck_attributes);
        input_lock_grp = 0;
        
        dlil_input_lock = lck_spin_alloc_init(input_lock_grp, lck_attributes);
        input_lock_grp = 0;