Author: bz
Date: Sat May 23 00:07:55 2009
New Revision: 192615
URL: http://svn.freebsd.org/changeset/base/192615
Log:
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
Modified:
head/sys/nfsclient/bootp_subr.c
Modified: head/sys/nfsclient/bootp_subr.c
==============================================================================
--- head/sys/nfsclient/bootp_subr.c Fri May 22 23:29:05 2009
(r192614)
+++ head/sys/nfsclient/bootp_subr.c Sat May 23 00:07:55 2009
(r192615)
@@ -242,7 +242,6 @@ static void bootpc_tag_helper(struct boo
#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, stru
}
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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
