diff options
| author | bz <bz@FreeBSD.org> | 2009-05-23 00:07:55 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2009-05-23 00:07:55 +0000 |
| commit | 8fc598097ff95cd9bd49e98ae0b30fc15ee228bc (patch) | |
| tree | f01efee273f47b19eb738453bbf9c8e094db2b1b /sys/nfsclient/bootp_subr.c | |
| parent | e9c6868a52fa6ddd255b6bb6a878b193c3deb431 (diff) | |
| download | FreeBSD-src-8fc598097ff95cd9bd49e98ae0b30fc15ee228bc.zip FreeBSD-src-8fc598097ff95cd9bd49e98ae0b30fc15ee228bc.tar.gz | |
It seems this file was ignored by MRT, rnh locking changes and new-arpv2.
So let the V_irtualization people finally make the disabled debugging code
compile again.
MFC after: 2 weeks
X-MFC: MRT and adapt rnh locking
Diffstat (limited to 'sys/nfsclient/bootp_subr.c')
| -rw-r--r-- | sys/nfsclient/bootp_subr.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index 05702f6..be6a588 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -242,7 +242,6 @@ static void bootpc_tag_helper(struct bootpc_tagcontext *tctx, #ifdef BOOTP_DEBUG void bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma); -void bootpboot_p_ma(struct sockaddr *ma); void bootpboot_p_rtentry(struct rtentry *rt); void bootpboot_p_tree(struct radix_node *rn); void bootpboot_p_rtlist(void); @@ -326,24 +325,11 @@ bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma) } void -bootpboot_p_ma(struct sockaddr *ma) -{ - - if (ma == NULL) { - printf("<null>"); - return; - } - printf("%x", *(int *)ma); -} - -void bootpboot_p_rtentry(struct rtentry *rt) { bootpboot_p_sa(rt_key(rt), rt_mask(rt)); printf(" "); - bootpboot_p_ma(rt->rt_genmask); - printf(" "); bootpboot_p_sa(rt->rt_gateway, NULL); printf(" "); printf("flags %x", (unsigned short) rt->rt_flags); @@ -375,9 +361,9 @@ bootpboot_p_rtlist(void) { printf("Routing table:\n"); - RADIX_NODE_LOCK(V_rt_tables[AF_INET]); /* could sleep XXX */ - bootpboot_p_tree(V_rt_tables[AF_INET]->rnh_treetop); - RADIX_NODE_UNLOCK(V_rt_tables[AF_INET]); + RADIX_NODE_HEAD_RLOCK(V_rt_tables[0][AF_INET]); /* could sleep XXX */ + bootpboot_p_tree(V_rt_tables[0][AF_INET]->rnh_treetop); + RADIX_NODE_HEAD_RUNLOCK(V_rt_tables[0][AF_INET]); } void |
