From owner-svn-src-stable-7@FreeBSD.ORG  Fri Feb  4 20:48:53 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E23E0106564A;
	Fri,  4 Feb 2011 20:48:53 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB5D68FC0C;
	Fri,  4 Feb 2011 20:48:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p14Kmr3v097576;
	Fri, 4 Feb 2011 20:48:53 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p14Kmrpl097574;
	Fri, 4 Feb 2011 20:48:53 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201102042048.p14Kmrpl097574@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 4 Feb 2011 20:48:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218298 - stable/7/sys/dev/vte
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Feb 2011 20:48:54 -0000

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;