aboutsummaryrefslogtreecommitdiff
path: root/sys/net/radix.c
diff options
context:
space:
mode:
authorKip Macy <kmacy@FreeBSD.org>2008-12-16 11:01:36 +0000
committerKip Macy <kmacy@FreeBSD.org>2008-12-16 11:01:36 +0000
commitd193ecc9a601e2a4fbc1b8127c7edb33279aaa69 (patch)
tree26a31667836b2da202eefbf8e7a5a827e4735b1f /sys/net/radix.c
parente3c46ebb60e325a8c7a6b5d369b7113e80315993 (diff)
downloadsrc-d193ecc9a601e2a4fbc1b8127c7edb33279aaa69.tar.gz
src-d193ecc9a601e2a4fbc1b8127c7edb33279aaa69.zip
remove assertion checks for now - ipfw uses its own lock for protecting its radix tree instance
Notes
Notes: svn path=/head/; revision=186176
Diffstat (limited to 'sys/net/radix.c')
-rw-r--r--sys/net/radix.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 3ab4a0105510..39b198eaf49e 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -274,7 +274,6 @@ rn_match(v_arg, head)
int off = t->rn_offset, vlen = LEN(cp), matched_off;
register int test, b, rn_bit;
- RADIX_NODE_HEAD_LOCK_ASSERT(head);
/*
* Open code rn_search(v, top) to avoid overhead of extra
* subroutine call.
@@ -619,8 +618,6 @@ rn_addroute(v_arg, n_arg, head, treenodes)
caddr_t mmask;
struct radix_mask *m, **mp;
-
- RADIX_NODE_HEAD_WLOCK_ASSERT(head);
/*
* In dealing with non-contiguous masks, there may be
* many different routes which have the same mask.
@@ -791,7 +788,6 @@ rn_delete(v_arg, netmask_arg, head)
caddr_t v, netmask;
int b, head_off, vlen;
- RADIX_NODE_HEAD_WLOCK_ASSERT(head);
v = v_arg;
netmask = netmask_arg;
x = head->rnh_treetop;
@@ -985,7 +981,6 @@ rn_walktree_from(h, a, m, f, w)
int stopping = 0;
int lastb;
- RADIX_NODE_HEAD_LOCK_ASSERT(h);
/*
* rn_search_m is sort-of-open-coded here. We cannot use the
* function because we need to keep track of the last node seen.
@@ -1093,7 +1088,6 @@ rn_walktree(h, f, w)
* the successor node in advance.
*/
- RADIX_NODE_HEAD_LOCK_ASSERT(h);
/* First time through node, go left */
while (rn->rn_bit >= 0)
rn = rn->rn_left;