d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove assertion checks for now - ipfw uses its own lock for protecting its radix tree instance

Browse Source
This commit is contained in:
Kip Macy 2008-12-16 11:01:36 +00:00
parent e3c46ebb60
commit d193ecc9a6
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/radix.c
View File

@ -274,7 +274,6 @@ rn_match(v_arg, head)
int off = t->rn_offset, vlen = LEN(cp), matched_off; int off = t->rn_offset, vlen = LEN(cp), matched_off;
register int test, b, rn_bit; register int test, b, rn_bit;
RADIX_NODE_HEAD_LOCK_ASSERT(head);
/* /*
* Open code rn_search(v, top) to avoid overhead of extra * Open code rn_search(v, top) to avoid overhead of extra
* subroutine call. * subroutine call.
@ -619,8 +618,6 @@ rn_addroute(v_arg, n_arg, head, treenodes)
caddr_t mmask; caddr_t mmask;
struct radix_mask *m, **mp; struct radix_mask *m, **mp;
RADIX_NODE_HEAD_WLOCK_ASSERT(head);
/* /*
* In dealing with non-contiguous masks, there may be * In dealing with non-contiguous masks, there may be
* many different routes which have the same mask. * many different routes which have the same mask.
@ -791,7 +788,6 @@ rn_delete(v_arg, netmask_arg, head)
caddr_t v, netmask; caddr_t v, netmask;
int b, head_off, vlen; int b, head_off, vlen;
RADIX_NODE_HEAD_WLOCK_ASSERT(head);
v = v_arg; v = v_arg;
netmask = netmask_arg; netmask = netmask_arg;
x = head->rnh_treetop; x = head->rnh_treetop;
@ -985,7 +981,6 @@ rn_walktree_from(h, a, m, f, w)
int stopping = 0; int stopping = 0;
int lastb; int lastb;
RADIX_NODE_HEAD_LOCK_ASSERT(h);
/* /*
* rn_search_m is sort-of-open-coded here. We cannot use the * 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. * 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. * the successor node in advance.
*/ */
RADIX_NODE_HEAD_LOCK_ASSERT(h);
/* First time through node, go left */ /* First time through node, go left */
while (rn->rn_bit >= 0) while (rn->rn_bit >= 0)
rn = rn->rn_left; rn = rn->rn_left;