svn commit: r231603 - head/sys/dev/oce

John Baldwin jhb at FreeBSD.org
Mon Feb 13 19:35:36 UTC 2012


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);


More information about the svn-src-all mailing list