From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 14:14:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 63EE916A4C0; Thu, 16 Oct 2003 14:14:40 -0700 (PDT)
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 2297416A4B3
	for <perforce@freebsd.org>; Thu, 16 Oct 2003 14:14:40 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9DAE943F75
	for <perforce@freebsd.org>; Thu, 16 Oct 2003 14:14:39 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9GLEdXJ026160
	for <perforce@freebsd.org>; Thu, 16 Oct 2003 14:14:39 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9GLEdlh026157
	for perforce@freebsd.org; Thu, 16 Oct 2003 14:14:39 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Thu, 16 Oct 2003 14:14:39 -0700 (PDT)
Message-Id: <200310162114.h9GLEdlh026157@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 39807 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: Thu, 16 Oct 2003 21:14:40 -0000
X-List-Received-Date: Thu, 16 Oct 2003 21:14:40 -0000

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

Change 39807 by sam@sam_ebb on 2003/10/16 14:14:03

	handle module unload cleanup when loading+unloading w/o
	starting a routing process

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_mroute.c#14 edit

Differences ...

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

@@ -3370,15 +3370,21 @@
 	legal_vif_num = X_legal_vif_num;
 	mrt_ioctl = X_mrt_ioctl;
 	rsvp_input_p = X_rsvp_input;
-	splx(s);
 	break;
 
     case MOD_UNLOAD:
-	/* XXX shutdown on module unload? */
+	/*
+	 * Typically module unload happens after the user-level
+	 * process has shutdown the kernel services (the check
+	 * below insures someone can't just yank the module out
+	 * from under a running process).  But if the module is
+	 * just loaded and then unloaded w/o starting up a user
+	 * process we still need to cleanup.
+	 */
 	if (ip_mrouter)
 	    return EINVAL;
 
-	s = splnet();
+	X_ip_mrouter_done();
 	ip_mcast_src = NULL;
 	ip_mforward = NULL;
 	ip_mrouter_done = NULL;
@@ -3389,7 +3395,6 @@
 	legal_vif_num = NULL;
 	mrt_ioctl = NULL;
 	rsvp_input_p = NULL;
-	splx(s);
 	break;
     }
     return 0;