diff options
| author | rwatson <rwatson@FreeBSD.org> | 2005-08-03 00:18:35 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2005-08-03 00:18:35 +0000 |
| commit | 9918d13b80941400bfab87834b1e2f1eea58c7c7 (patch) | |
| tree | 9a4e586ffbcd1450917ee5e388a4e1eb38254e32 /sys/dev/ex | |
| parent | efa13b9da9fc80838e2c73140ae27393b3660da4 (diff) | |
| download | FreeBSD-src-9918d13b80941400bfab87834b1e2f1eea58c7c7.zip FreeBSD-src-9918d13b80941400bfab87834b1e2f1eea58c7c7.tar.gz | |
Modify device drivers supporting multicast addresses to lock if_addr_mtx
over iteration of their multicast address lists when synchronizing the
hardware address filter with the network stack-maintained list.
Problem reported by: Ed Maste (emaste at phaedrus dot sandvine dot ca>
MFC after: 1 week
Diffstat (limited to 'sys/dev/ex')
| -rw-r--r-- | sys/dev/ex/if_ex.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index 300e433..51fc4f4 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -840,11 +840,13 @@ ex_setmulti(struct ex_softc *sc) ifp = sc->ifp; count = 0; + IF_ADDR_LOCK(ifp); TAILQ_FOREACH(maddr, &ifp->if_multiaddrs, ifma_link) { if (maddr->ifma_addr->sa_family != AF_LINK) continue; count++; } + IF_ADDR_UNLOCK(ifp); if ((ifp->if_flags & IFF_PROMISC) || (ifp->if_flags & IFF_ALLMULTI) || count > 63) { @@ -871,7 +873,8 @@ ex_setmulti(struct ex_softc *sc) CSR_WRITE_2(sc, IO_PORT_REG, 0); CSR_WRITE_2(sc, IO_PORT_REG, 0); CSR_WRITE_2(sc, IO_PORT_REG, (count + 1) * 6); - + + IF_ADDR_LOCK(ifp); TAILQ_FOREACH(maddr, &ifp->if_multiaddrs, ifma_link) { if (maddr->ifma_addr->sa_family != AF_LINK) continue; @@ -882,6 +885,7 @@ ex_setmulti(struct ex_softc *sc) CSR_WRITE_2(sc, IO_PORT_REG, *addr++); CSR_WRITE_2(sc, IO_PORT_REG, *addr++); } + IF_ADDR_UNLOCK(ifp); /* Program our MAC address as well */ /* XXX: Is this necessary? The Linux driver does this |
