From owner-svn-src-head@FreeBSD.ORG  Fri Jun 26 19:04:09 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 19374106564A;
	Fri, 26 Jun 2009 19:04:09 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 076E48FC08;
	Fri, 26 Jun 2009 19:04:09 +0000 (UTC)
	(envelope-from rwatson@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 n5QJ48oB095332;
	Fri, 26 Jun 2009 19:04:08 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QJ48Fl095330;
	Fri, 26 Jun 2009 19:04:08 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906261904.n5QJ48Fl095330@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 26 Jun 2009 19:04:08 +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: r195071 - head/sys/dev/cxgb
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: Fri, 26 Jun 2009 19:04:09 -0000

Author: rwatson
Date: Fri Jun 26 19:04:08 2009
New Revision: 195071
URL: http://svn.freebsd.org/changeset/base/195071

Log:
  Use if_maddr_rlock() instead of IF_ADDR_LOCK() to protect access to
  if_multiaddrs in if_cxgb.
  
  Approved by:	re (kib)
  MFC after:	6 weeks

Modified:
  head/sys/dev/cxgb/cxgb_adapter.h

Modified: head/sys/dev/cxgb/cxgb_adapter.h
==============================================================================
--- head/sys/dev/cxgb/cxgb_adapter.h	Fri Jun 26 18:50:49 2009	(r195070)
+++ head/sys/dev/cxgb/cxgb_adapter.h	Fri Jun 26 19:04:08 2009	(r195071)
@@ -467,7 +467,7 @@ t3_get_next_mcaddr(struct t3_rx_mode *rm
 	struct ifmultiaddr *ifma;
 	int i = 0;
 
-	IF_ADDR_LOCK(ifp);
+	if_maddr_rlock(ifp);
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
@@ -477,8 +477,7 @@ t3_get_next_mcaddr(struct t3_rx_mode *rm
 		}
 		i++;
 	}
-	IF_ADDR_UNLOCK(ifp);
-
+	if_maddr_runlock(ifp);
 	
 	rm->idx++;
 	return (macaddr);