PERFORCE change 80824 for review

[Robert Watson]

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

Change 80824 by rwatson at 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);
 }