summaryrefslogtreecommitdiffstats
path: root/sys/dev/alc
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-06-26 11:45:06 +0000
committerrwatson <rwatson@FreeBSD.org>2009-06-26 11:45:06 +0000
commitbe5740a255fbcb1d4053e709cb7f22bb96320eb0 (patch)
tree30aee113c454323f30d4c201e18a0f29e2938074 /sys/dev/alc
parentffea8e20279ff0d82924add1cef0d8e16d9538a5 (diff)
downloadFreeBSD-src-be5740a255fbcb1d4053e709cb7f22bb96320eb0.zip
FreeBSD-src-be5740a255fbcb1d4053e709cb7f22bb96320eb0.tar.gz
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
Diffstat (limited to 'sys/dev/alc')
-rw-r--r--sys/dev/alc/if_alc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
index dc1c1fd..b28a411 100644
--- a/sys/dev/alc/if_alc.c
+++ b/sys/dev/alc/if_alc.c
@@ -3446,7 +3446,7 @@ alc_rxfilter(struct alc_softc *sc)
goto chipit;
}
- IF_ADDR_LOCK(ifp);
+ if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &sc->alc_ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -3454,7 +3454,7 @@ alc_rxfilter(struct alc_softc *sc)
ifma->ifma_addr), ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
}
- IF_ADDR_UNLOCK(ifp);
+ if_maddr_runlock(ifp);
chipit:
CSR_WRITE_4(sc, ALC_MAR0, mchash[0]);
OpenPOWER on IntegriCloud