From be5740a255fbcb1d4053e709cb7f22bb96320eb0 Mon Sep 17 00:00:00 2001 From: rwatson 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/pci/if_rl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/pci/if_rl.c') diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index 16e3ccc..8b22516 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -697,7 +697,7 @@ rl_setmulti(struct rl_softc *sc) CSR_WRITE_4(sc, RL_MAR4, 0); /* now program new ones */ - IF_ADDR_LOCK(ifp); + if_maddr_rlock(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -709,7 +709,7 @@ rl_setmulti(struct rl_softc *sc) hashes[1] |= (1 << (h - 32)); mcnt++; } - IF_ADDR_UNLOCK(ifp); + if_maddr_runlock(ifp); if (mcnt) rxfilt |= RL_RXCFG_RX_MULTI; -- cgit v1.1