From owner-p4-projects@FreeBSD.ORG  Sat Jul 23 00:18:36 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 C431116A421; Sat, 23 Jul 2005 00:18:35 +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 9DF2616A41F
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 00:18:35 +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 6AB1B43D45
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 00:18:35 +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 j6N0IZ9T051332
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 00:18:35 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 j6N0IZ7D051329
	for perforce@freebsd.org; Sat, 23 Jul 2005 00:18:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 23 Jul 2005 00:18:35 GMT
Message-Id: <200507230018.j6N0IZ7D051329@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 80824 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:18:36 -0000

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

Change 80824 by rwatson@rwatson_zoo on 2005/07/23 00:17:48

	De-SPL IPv4 multicast code.

Affected files ...

.. //depot/projects/netsmp/src/sys/netinet/in.c#4 edit

Differences ...

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

@@ -956,7 +956,6 @@
 	int error;
 	struct sockaddr_in sin;
 	struct ifmultiaddr *ifma;
-	int s = splnet();
 
 	IN_MULTI_LOCK();
 	/*
@@ -971,7 +970,6 @@
 	error = if_addmulti(ifp, (struct sockaddr *)&sin, &ifma);
 	if (error) {
 		IN_MULTI_UNLOCK();
-		splx(s);
 		return 0;
 	}
 
@@ -981,7 +979,6 @@
 	 */
 	if (ifma->ifma_protospec != NULL) {
 		IN_MULTI_UNLOCK();
-		splx(s);
 		return ifma->ifma_protospec;
 	}
 
@@ -989,7 +986,6 @@
 	    M_NOWAIT | M_ZERO);
 	if (inm == NULL) {
 		IN_MULTI_UNLOCK();
-		splx(s);
 		return (NULL);
 	}
 
@@ -1004,7 +1000,6 @@
 	 */
 	igmp_joingroup(inm);
 	IN_MULTI_UNLOCK();
-	splx(s);
 	return (inm);
 }
 
@@ -1017,7 +1012,6 @@
 {
 	struct ifmultiaddr *ifma;
 	struct in_multi my_inm;
-	int s = splnet();
 
 	IN_MULTI_LOCK();
 	ifma = inm->inm_ifma;
@@ -1039,5 +1033,4 @@
 	if (my_inm.inm_ifp != NULL)
 		igmp_leavegroup(&my_inm);
 	IN_MULTI_UNLOCK();
-	splx(s);
 }