From owner-p4-projects@FreeBSD.ORG  Wed Dec 24 12:12:41 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E44FE16A4D0; Wed, 24 Dec 2003 12:12:40 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B8B9416A4CE
	for <perforce@freebsd.org>; Wed, 24 Dec 2003 12:12:40 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AB6CB43D45
	for <perforce@freebsd.org>; Wed, 24 Dec 2003 12:12:39 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOKCd0B041954
	for <perforce@freebsd.org>; Wed, 24 Dec 2003 12:12:39 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOKCdVC041951
	for perforce@freebsd.org; Wed, 24 Dec 2003 12:12:39 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 24 Dec 2003 12:12:39 -0800 (PST)
Message-Id: <200312242012.hBOKCdVC041951@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44291 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Dec 2003 20:12:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=44291

Change 44291 by sam@sam_ebb on 2003/12/24 12:12:16

	fix merge botch

Affected files ...

.. //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#6 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#6 (text+ko) ====

@@ -3378,25 +3378,6 @@
 }
 #endif /* PIM */
 
-static void
-ip_mrouter_reset(void)
-{
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-    bzero((caddr_t)nexpire, sizeof(nexpire));
-
-    pim_assert = 0;
-    mrt_api_config = 0;
-
-    callout_init(&expire_upcalls_ch, CALLOUT_MPSAFE);
-
-    bw_upcalls_n = 0;
-    bzero((caddr_t)bw_meter_timers, sizeof(bw_meter_timers));
-    callout_init(&bw_upcalls_ch, CALLOUT_MPSAFE);
-    callout_init(&bw_meter_ch, CALLOUT_MPSAFE);
-
-    callout_init(&tbf_reprocess_ch, CALLOUT_MPSAFE);
-}
-
 static int
 ip_mroute_modevent(module_t mod, int type, void *unused)
 {