From owner-svn-src-all@FreeBSD.ORG  Mon Feb 13 19:35:36 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67BB61065674;
	Mon, 13 Feb 2012 19:35:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 574228FC18;
	Mon, 13 Feb 2012 19:35:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1DJZaa1058471;
	Mon, 13 Feb 2012 19:35:36 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1DJZaQX058469;
	Mon, 13 Feb 2012 19:35:36 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201202131935.q1DJZaQX058469@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 13 Feb 2012 19:35:36 +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: r231603 - head/sys/dev/oce
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2012 19:35:36 -0000

Author: jhb
Date: Mon Feb 13 19:35:35 2012
New Revision: 231603
URL: http://svn.freebsd.org/changeset/base/231603

Log:
  Use if_maddr_*lock() routines to lock the per-interface multicast
  address list rather than manipulating the lock directly.

Modified:
  head/sys/dev/oce/oce_hw.c

Modified: head/sys/dev/oce/oce_hw.c
==============================================================================
--- head/sys/dev/oce/oce_hw.c	Mon Feb 13 19:31:32 2012	(r231602)
+++ head/sys/dev/oce/oce_hw.c	Mon Feb 13 19:35:35 2012	(r231603)
@@ -558,7 +558,7 @@ oce_hw_update_multicast(POCE_SOFTC sc)
 	bzero(req, sizeof(struct mbx_set_common_iface_multicast));
 
 #if __FreeBSD_version > 800000
-	IF_ADDR_RLOCK(ifp);
+	if_maddr_rlock(ifp);
 #endif
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
@@ -578,7 +578,7 @@ oce_hw_update_multicast(POCE_SOFTC sc)
 		req->params.req.num_mac = req->params.req.num_mac + 1;
 	}
 #if __FreeBSD_version > 800000
-	IF_ADDR_RUNLOCK(ifp);
+	if_maddr_runlock(ifp);
 #endif
 	req->params.req.if_id = sc->if_id;
 	rc = oce_update_multicast(sc, &dma);