svn commit: r218298 - stable/7/sys/dev/vte

[Pyun YongHyeon]

Author: yongari
Date: Fri Feb  4 20:48:53 2011
New Revision: 218298
URL: http://svn.freebsd.org/changeset/base/218298

Log:
  Make vte(4) work on stable/7. This is direct commit to stable/7
  since if_maddr_rlock/if_maddr_runlock is not available in stable/7.

Modified:
  stable/7/sys/dev/vte/if_vte.c

Modified: stable/7/sys/dev/vte/if_vte.c
==============================================================================
--- stable/7/sys/dev/vte/if_vte.c	Fri Feb  4 20:47:46 2011	(r218297)
+++ stable/7/sys/dev/vte/if_vte.c	Fri Feb  4 20:48:53 2011	(r218298)
@@ -1979,7 +1979,7 @@ vte_rxfilter(struct vte_softc *sc)
 	}
 
 	nperf = 0;
-	if_maddr_rlock(ifp);
+	IF_ADDR_LOCK(ifp);
 	TAILQ_FOREACH(ifma, &sc->vte_ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
@@ -2000,7 +2000,7 @@ vte_rxfilter(struct vte_softc *sc)
 		    ifma->ifma_addr), ETHER_ADDR_LEN);
 		mchash[crc >> 30] |= 1 << ((crc >> 26) & 0x0F);
 	}
-	if_maddr_runlock(ifp);
+	IF_ADDR_UNLOCK(ifp);
 	if (mchash[0] != 0 || mchash[1] != 0 || mchash[2] != 0 ||
 	    mchash[3] != 0)
 		mcr |= MCR0_MULTICAST;