PERFORCE change 80828 for review

[Robert Watson]

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

Change 80828 by rwatson at 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