From owner-svn-src-head@FreeBSD.ORG  Sat May 23 00:07:55 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C79771065672;
	Sat, 23 May 2009 00:07:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B5C348FC23;
	Sat, 23 May 2009 00:07:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4N07tRh023298;
	Sat, 23 May 2009 00:07:55 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4N07taT023297;
	Sat, 23 May 2009 00:07:55 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200905230007.n4N07taT023297@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 23 May 2009 00:07:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192615 - head/sys/nfsclient
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 May 2009 00:07:56 -0000

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