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

Revert previous commit (262727) and bounce patch back to the

Browse Source 
submitter.

Pointed out by: jhb
This commit is contained in:
George V. Neville-Neil 2014-03-04 23:55:04 +00:00
parent a2cba42fc2
commit 9b5f5ede41
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=262758
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/radix.h
View File

@ -149,8 +149,7 @@ struct radix_node_head {
#define RADIX_NODE_HEAD_DESTROY(rnh) rw_destroy(&(rnh)->rnh_lock)
#define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_WLOCKED)
#define RADIX_NODE_HEAD_RLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_RLOCKED)
#define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_LOCKED)
#define RADIX_NODE_HEAD_WLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_WLOCKED)
#endif /* _KERNEL */

5
sys/net/route.c
View File

@ -381,7 +381,7 @@ rtalloc1_fib(struct sockaddr *dst, int report, u_long ignflags,
RADIX_NODE_HEAD_RLOCK(rnh);
#ifdef INVARIANTS
else
RADIX_NODE_HEAD_RLOCK_ASSERT(rnh);
RADIX_NODE_HEAD_LOCK_ASSERT(rnh);
#endif
rn = rnh->rnh_matchaddr(dst, rnh);
if (rn && ((rn->rn_flags & RNF_ROOT) == 0)) {
@ -1000,10 +1000,9 @@ rn_mpath_update(int req, struct rt_addrinfo *info,
* a matching RTAX_GATEWAY.
*/
struct rtentry *rt, *rto = NULL;
struct radix_node *rn;
register struct radix_node *rn;
int error = 0;
RADIX_NODE_HEAD_LOCK_ASSERT(rnh);
rn = rnh->rnh_lookup(dst, netmask, rnh);
if (rn == NULL)
return (ESRCH);