xnu-792.12.6.tar.gz

[apple/xnu.git] / bsd / netat / aurp_open.c

diff --git a/bsd/netat/aurp_open.c b/bsd/netat/aurp_open.c
index 4bda301fdf7c009275469cd8e8a929d01f088359..ca6652d7d5804018f8fe6eb8a8644710473527fa 100644 (file)
--- a/bsd/netat/aurp_open.c
+++ b/bsd/netat/aurp_open.c
@@ -1,26 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
+ * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
+ * 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
+ *
+ * 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_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  *     Copyright (c) 1996 Apple Computer, Inc. 
@@ -53,13 +58,13 @@
 #include <netat/debug.h>
 
 
-/* funnel version of AURPsndOpenReq */
-void AURPsndOpenReq_funnel(state)
+/* locked version of AURPsndOpenReq */
+void AURPsndOpenReq_locked(state)
        aurp_state_t *state;
 {
-        thread_funnel_set(network_flock, TRUE);
+       atalk_lock();
        AURPsndOpenReq(state);
-        thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();
 }
 
 /* */
@@ -119,7 +124,7 @@ void AURPsndOpenReq(state)
        }
 
        /* start the retry timer */
-       timeout(AURPsndOpenReq_funnel, state, AURP_RetryInterval*HZ);
+       timeout(AURPsndOpenReq_locked, state, AURP_RetryInterval*HZ);
        state->rcv_tmo = 1;
 }
 
@@ -221,7 +226,7 @@ void AURPrcvOpenRsp(state, m)
        }
 
        /* cancel the retry timer */
-       untimeout(AURPsndOpenReq_funnel, state);
+       untimeout(AURPsndOpenReq_locked, state);
        state->rcv_tmo = 0;
        state->rcv_retry = 0;