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/pci/if_sis.c | |
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/pci/if_sis.c')
-rw-r--r-- | sys/pci/if_sis.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index b455b83..48a6132 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -763,6 +763,7 @@ sis_setmulti_ns(struct sis_softc *sc) CSR_WRITE_4(sc, SIS_RXFILT_DATA, 0); } + IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -775,6 +776,7 @@ sis_setmulti_ns(struct sis_softc *sc) bit -= 0x10; SIS_SETBIT(sc, SIS_RXFILT_DATA, (1 << bit)); } + IF_ADDR_UNLOCK(ifp); CSR_WRITE_4(sc, SIS_RXFILT_CTL, filtsave); @@ -813,6 +815,7 @@ sis_setmulti_sis(struct sis_softc *sc) for (i = 0; i < n; i++) hashes[i] = 0; i = 0; + IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -821,6 +824,7 @@ sis_setmulti_sis(struct sis_softc *sc) hashes[h >> 4] |= 1 << (h & 0xf); i++; } + IF_ADDR_UNLOCK(ifp); if (i > n) { ctl |= SIS_RXFILTCTL_ALLMULTI; for (i = 0; i < n; i++) |