From owner-svn-src-head@FreeBSD.ORG  Wed Dec 17 04:33:52 2008
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 A63E71065670;
	Wed, 17 Dec 2008 04:33:52 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 967598FC13;
	Wed, 17 Dec 2008 04:33:52 +0000 (UTC)
	(envelope-from kmacy@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 mBH4XqP2057619;
	Wed, 17 Dec 2008 04:33:52 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBH4XqkH057618;
	Wed, 17 Dec 2008 04:33:52 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812170433.mBH4XqkH057618@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 17 Dec 2008 04:33:52 +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: r186209 - head/sys/net
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: Wed, 17 Dec 2008 04:33:52 -0000

Author: kmacy
Date: Wed Dec 17 04:33:52 2008
New Revision: 186209
URL: http://svn.freebsd.org/changeset/base/186209

Log:
  avoid trying to acquire a shared lock while holding an exclusive lock
  by making the ifnet lock acquisition exclusive

Modified:
  head/sys/net/if.c

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Wed Dec 17 04:15:38 2008	(r186208)
+++ head/sys/net/if.c	Wed Dec 17 04:33:52 2008	(r186209)
@@ -197,9 +197,9 @@ ifnet_byindex(u_short idx)
 	INIT_VNET_NET(curvnet);
 	struct ifnet *ifp;
 
-	IFNET_RLOCK();
+	IFNET_WLOCK();
 	ifp = V_ifindex_table[idx].ife_ifnet;
-	IFNET_RUNLOCK();
+	IFNET_WUNLOCK();
 	return (ifp);
 }
 
@@ -218,9 +218,9 @@ ifaddr_byindex(u_short idx)
 {
 	struct ifaddr *ifa;
 
-	IFNET_RLOCK();
+	IFNET_WLOCK();
 	ifa = ifnet_byindex(idx)->if_addr;
-	IFNET_RUNLOCK();
+	IFNET_WUNLOCK();
 	return (ifa);
 }