xnu-792.6.61.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 22f0d103d48f3d79f2d3d847f2232c78be22845a..6f125f76e253894c0ef2099a662c56f93396b7b3 100644 (file)
--- a/bsd/netat/ddp_brt.c
+++ b/bsd/netat/ddp_brt.c
@@ -68,6 +68,8 @@
 ddp_brt_t at_ddp_brt[BRTSIZE];
 int ddp_brt_sweep_timer;
 
+void ddp_brt_sweep();
+
 void ddp_glean(mp, ifID, src_addr)
      register gbuf_t     *mp;
      register at_ifaddr_t  *ifID;
@@ -128,7 +130,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
 }
 
@@ -137,17 +139,17 @@ 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 */
+void ddp_brt_sweep_locked()
 {
-        thread_funnel_set(network_flock, TRUE);
+       atalk_lock();
        ddp_brt_sweep();
-        thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();
 }
 
 void ddp_brt_sweep()
@@ -180,7 +182,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
 
 }