From owner-p4-projects@FreeBSD.ORG  Wed Aug  6 10:48:52 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F1CE337B401; Wed,  6 Aug 2003 10:48:51 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9D56E37B404
	for <perforce@freebsd.org>; Wed,  6 Aug 2003 10:48:51 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2B98743F85
	for <perforce@freebsd.org>; Wed,  6 Aug 2003 10:48:51 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h76Hmp0U061997
	for <perforce@freebsd.org>; Wed, 6 Aug 2003 10:48:51 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h76Hmo6J061994
	for perforce@freebsd.org; Wed, 6 Aug 2003 10:48:50 -0700 (PDT)
Date: Wed, 6 Aug 2003 10:48:50 -0700 (PDT)
Message-Id: <200308061748.h76Hmo6J061994@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 35637 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2003 17:48:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=35637

Change 35637 by sam@sam_ebb on 2003/08/06 10:48:15

	collect "lost" routing table locking changes

Affected files ...

.. //depot/projects/netperf/sys/net/if_stf.c#2 edit
.. //depot/projects/netperf/sys/netinet/in_pcb.h#2 edit
.. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#2 edit

Differences ...

==== //depot/projects/netperf/sys/net/if_stf.c#2 (text+ko) ====

@@ -718,6 +718,7 @@
 	struct rtentry *rt;
 	struct rt_addrinfo *info;
 {
+	RT_LOCK_ASSERT(rt, MA_OWNED);
 
 	if (rt)
 		rt->rt_rmx.rmx_mtu = IPV6_MMTU;

==== //depot/projects/netperf/sys/netinet/in_pcb.h#2 (text+ko) ====

@@ -260,6 +260,9 @@
 #define INP_INFO_RUNLOCK(ipi)	mtx_unlock(&(ipi)->ipi_mtx)
 #define INP_INFO_WUNLOCK(ipi)	mtx_unlock(&(ipi)->ipi_mtx)
 
+#define INP_INFO_RLOCK_ASSERT(ipi)	mtx_assert(&(ipi)->ipi_mtx, MA_OWNED)
+#define INP_INFO_WLOCK_ASSERT(ipi)	mtx_assert(&(ipi)->ipi_mtx, MA_OWNED)
+
 #define INP_PCBHASH(faddr, lport, fport, mask) \
 	(((faddr) ^ ((faddr) >> 16) ^ ntohs((lport) ^ (fport))) & (mask))
 #define INP_PCBPORTHASH(lport, mask) \

==== //depot/projects/netperf/sys/netinet6/in6_ifattach.c#2 (text+ko) ====

@@ -985,9 +985,10 @@
 	sin6.sin6_addr = in6addr_linklocal_allnodes;
 	sin6.sin6_addr.s6_addr16[1] = htons(ifp->if_index);
 	rt = rtalloc1((struct sockaddr *)&sin6, 0, 0UL);
-	if (rt && rt->rt_ifp == ifp) {
-		rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt),
-			rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0);
+	if (rt) {
+		if (rt->rt_ifp == ifp)
+			rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt),
+				rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0);
 		rtfree(rt);
 	}
 }