xnu-1228.3.13.tar.gz

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

diff --git a/bsd/netat/ddp_brt.c b/bsd/netat/ddp_brt.c
index 961d535e42e9083ceec324582c3f3dfc6db8c72c..ce35ae98acaeedb342f98c8405746884836dae8c 100644 (file)
--- a/bsd/netat/ddp_brt.c
+++ b/bsd/netat/ddp_brt.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_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
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  *     Copyright (c) 1988, 1989 Apple Computer, Inc. 
@@ -71,6 +74,7 @@
 ddp_brt_t at_ddp_brt[BRTSIZE];
 int ddp_brt_sweep_timer;
 
+
 void ddp_glean(mp, ifID, src_addr)
      register gbuf_t     *mp;
      register at_ifaddr_t  *ifID;
@@ -131,7 +135,7 @@ void ddp_brt_init()
        bzero(at_ddp_brt, sizeof(at_ddp_brt));
        ddp_brt_sweep_timer = 1;
 #ifdef NOT_USED
-       timeout(ddp_brt_sweep_funnel, (long)0, BRT_SWEEP_INT * SYS_HZ);
+       timeout(ddp_brt_sweep_locked, (long)0, BRT_SWEEP_INT * SYS_HZ);
 #endif
 }
 
@@ -140,20 +144,22 @@ void ddp_brt_shutdown()
 #ifdef NOT_USED
        bzero(at_ddp_brt, sizeof(at_ddp_brt));
        if (ddp_brt_sweep_timer)
-               untimeout(ddp_brt_sweep_funnel, 0);
+               untimeout(ddp_brt_sweep_locked, 0);
 #endif
        ddp_brt_sweep_timer = 0;
 }
 
-/* funneled version */
-void ddp_brt_sweep_funnel()
+/* locked version */
+#ifdef NOT_USED
+void ddp_brt_sweep_locked()
 {
-        thread_funnel_set(network_flock, TRUE);
+       atalk_lock();
        ddp_brt_sweep();
-        thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();
 }
+#endif
 
-void ddp_brt_sweep()
+void ddp_brt_sweep(void)
 {
         register ddp_brt_t      *brt;
        register int            i;
@@ -183,7 +189,7 @@ void ddp_brt_sweep()
          }
 #ifdef NOT_USED
        /* set up the next sweep... */
-       timeout(ddp_brt_sweep_funnel, (long)0, BRT_SWEEP_INT * SYS_HZ);
+       timeout(ddp_brt_sweep_locked, (long)0, BRT_SWEEP_INT * SYS_HZ);
 #endif
 
 }