From owner-p4-projects@FreeBSD.ORG  Sat Jul 23 00:33:38 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D7FB16A421; Sat, 23 Jul 2005 00:33:38 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 E13F116A41F
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 00:33:37 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AEFCC43D45
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 00:33:37 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6N0Xbav051933
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 00:33:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6N0Xbci051930
	for perforce@freebsd.org; Sat, 23 Jul 2005 00:33:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 23 Jul 2005 00:33:37 GMT
Message-Id: <200507230033.j6N0Xbci051930@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80828 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 23 Jul 2005 00:33:39 -0000

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

Change 80828 by rwatson@rwatson_zoo on 2005/07/23 00:32:37

	De-spl IGMP now that IPv4 multicast address lists are locked
	down.

Affected files ...

.. //depot/projects/netsmp/src/sys/netinet/igmp.c#3 edit

Differences ...

==== //depot/projects/netsmp/src/sys/netinet/igmp.c#3 (text+ko) ====

@@ -368,7 +368,6 @@
 void
 igmp_joingroup(struct in_multi *inm)
 {
-	int s = splnet();
 
 	IN_MULTI_LOCK_ASSERT();
 
@@ -389,7 +388,6 @@
 		}
 		/* XXX handling of failure case? */
 	}
-	splx(s);
 }
 
 void
@@ -410,7 +408,6 @@
 {
 	register struct in_multi *inm;
 	struct in_multistep step;
-	int s;
 
 	/*
 	 * Quick check to see if any work needs to be done, in order
@@ -420,7 +417,6 @@
 	if (!igmp_timers_are_running)
 		return;
 
-	s = splnet();
 	IN_MULTI_LOCK();
 	igmp_timers_are_running = 0;
 	IN_FIRST_MULTI(step, inm);
@@ -436,13 +432,11 @@
 		IN_NEXT_MULTI(step, inm);
 	}
 	IN_MULTI_UNLOCK();
-	splx(s);
 }
 
 void
 igmp_slowtimo(void)
 {
-	int s = splnet();
 	struct router_info *rti;
 
 	IGMP_PRINTF("[igmp.c,_slowtimo] -- > entering \n");
@@ -456,7 +450,6 @@
 	}
 	mtx_unlock(&igmp_mtx);
 	IGMP_PRINTF("[igmp.c,_slowtimo] -- > exiting \n");
-	splx(s);
 }
 
 static void