xnu-2050.7.9.tar.gz

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

diff --git a/bsd/net/radix.c b/bsd/net/radix.c
index 876675d542b5086d68e28f5770b768395e67d3c4..51c90586ac98f36f8a1d3b74ad0e264eb12e9fd2 100644 (file)
--- a/bsd/net/radix.c
+++ b/bsd/net/radix.c
@@ -101,12 +101,11 @@ static char *rn_zeros, *rn_ones;
 
 extern lck_grp_t       *domain_proto_mtx_grp;
 extern lck_attr_t      *domain_proto_mtx_attr;
 
 extern lck_grp_t       *domain_proto_mtx_grp;
 extern lck_attr_t      *domain_proto_mtx_attr;

-lck_mtx_t *rn_mutex;

 
 #define rn_masktop (mask_rnhead->rnh_treetop)
 #undef Bcmp
 #define Bcmp(a, b, l) \
 
 #define rn_masktop (mask_rnhead->rnh_treetop)
 #undef Bcmp
 #define Bcmp(a, b, l) \

-       (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l))
+       (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (uint32_t)l))

 
 static int     rn_lexobetter(void *m_arg, void *n_arg);
 static struct radix_mask *
 
 static int     rn_lexobetter(void *m_arg, void *n_arg);
 static struct radix_mask *


@@ -1173,6 +1172,4 @@ rn_init(void)
                *cp++ = -1;
        if (rn_inithead((void **)&mask_rnhead, 0) == 0)
                panic("rn_init 2");
                *cp++ = -1;
        if (rn_inithead((void **)&mask_rnhead, 0) == 0)
                panic("rn_init 2");

-
-       rn_mutex = lck_mtx_alloc_init(domain_proto_mtx_grp, domain_proto_mtx_attr);

 }
 }