From owner-svn-src-head@FreeBSD.ORG  Sun Sep 13 01:00:25 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAE961065692;
	Sun, 13 Sep 2009 01:00:25 +0000 (UTC) (envelope-from bms@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99AFA8FC23;
	Sun, 13 Sep 2009 01:00:25 +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 n8D10Pet002460;
	Sun, 13 Sep 2009 01:00:25 GMT (envelope-from bms@svn.freebsd.org)
Received: (from bms@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8D10PAu002459;
	Sun, 13 Sep 2009 01:00:25 GMT (envelope-from bms@svn.freebsd.org)
Message-Id: <200909130100.n8D10PAu002459@svn.freebsd.org>
From: Bruce M Simpson <bms@FreeBSD.org>
Date: Sun, 13 Sep 2009 01:00:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197148 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Sep 2009 01:00:25 -0000

Author: bms
Date: Sun Sep 13 01:00:24 2009
New Revision: 197148
URL: http://svn.freebsd.org/changeset/base/197148

Log:
  In expire_mfc(), add an assert on the multicast forwarding cache mutex.
  
  PR:		138666

Modified:
  head/sys/netinet/ip_mroute.c

Modified: head/sys/netinet/ip_mroute.c
==============================================================================
--- head/sys/netinet/ip_mroute.c	Sat Sep 12 23:01:36 2009	(r197147)
+++ head/sys/netinet/ip_mroute.c	Sun Sep 13 01:00:24 2009	(r197148)
@@ -1025,6 +1025,8 @@ expire_mfc(struct mfc *rt)
 {
 	struct rtdetq *rte, *nrte;
 
+	MFC_LOCK_ASSERT();
+
 	free_bw_list(rt->mfc_bw_meter);
 
 	TAILQ_FOREACH_SAFE(rte, &rt->mfc_stall, rte_link, nrte) {