PERFORCE change 39275 for review

[Sam Leffler]

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

Change 39275 by sam at sam_ebb on 2003/10/06 15:16:29

	can't assert Giant is not owned--with net.isr.enable set to
	1 there are paths that bring us in to ip_input with Giant
	held (e.g. through the loopback interface)

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_divert.c#5 edit
.. //depot/projects/netperf/sys/netinet/ip_input.c#9 edit
.. //depot/projects/netperf/sys/netinet/ip_mroute.c#12 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_divert.c#5 (text+ko) ====

@@ -158,8 +158,6 @@
 	u_int16_t nport;
 	struct sockaddr_in divsrc;
 
-	mtx_assert(&Giant, MA_NOTOWNED);
-
 	/* Sanity check */
 	KASSERT(port != 0, ("%s: port=0", __func__));
 

==== //depot/projects/netperf/sys/netinet/ip_input.c#9 (text+ko) ====

@@ -367,8 +367,6 @@
 	int s, error;
 #endif /* FAST_IPSEC */
 
-	mtx_assert(&Giant, MA_NOTOWNED);
-
 	args.eh = NULL;
 	args.oif = NULL;
 	args.rule = NULL;

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

@@ -1312,8 +1312,6 @@
     int error;
     vifi_t vifi;
 
-    mtx_assert(&Giant, MA_NOTOWNED);
-
     if (mrtdebug & DEBUG_FORWARD)
 	log(LOG_DEBUG, "ip_mforward: src %lx, dst %lx, ifp %p\n",
 	    (u_long)ntohl(ip->ip_src.s_addr), (u_long)ntohl(ip->ip_dst.s_addr),