PERFORCE change 44291 for review

[Sam Leffler]

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

Change 44291 by sam at 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)
 {