From eb956cd041f956275522092d6ba66671356ff84f Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 26 Jun 2009 11:45:06 +0000 Subject: Use if_maddr_rlock()/if_maddr_runlock() rather than IF_ADDR_LOCK()/ IF_ADDR_UNLOCK() across network device drivers when accessing the per-interface multicast address list, if_multiaddrs. This will allow us to change the locking strategy without affecting our driver programming interface or binary interface. For two wireless drivers, remove unnecessary locking, since they don't actually access the multicast address list. Approved by: re (kib) MFC after: 6 weeks --- sys/dev/xe/if_xe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/xe') diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index e73d56a9b36e..f18fd9842c91 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -1390,7 +1390,7 @@ xe_set_multicast(struct xe_softc *scp) /* Iterate over multicast address list */ count = 0; - IF_ADDR_LOCK(ifp); + if_maddr_rlock(ifp); TAILQ_FOREACH(maddr, &ifp->if_multiaddrs, ifma_link) { if (maddr->ifma_addr->sa_family != AF_LINK) continue; @@ -1413,7 +1413,7 @@ xe_set_multicast(struct xe_softc *scp) /* Nowhere else to put them on CE2 */ break; } - IF_ADDR_UNLOCK(ifp); + if_maddr_runlock(ifp); DEVPRINTF(2, (scp->dev, "set_multicast: count = %u\n", count)); -- cgit v1.3