PERFORCE change 41494 for review

[Sam Leffler]

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

Change 41494 by sam at sam_ebb on 2003/11/05 15:19:28

	Cannot use NET_PICKUP/DROP_GIANT since we might be entered
	from the syncache timer routine.

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_divert.c#12 edit

Differences ...

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

@@ -231,7 +231,7 @@
 	 * the moment we're ignoring this. Once sockets are
 	 * locked this cruft can be removed.
 	 */
-	NET_PICKUP_GIANT();
+	mtx_lock(&Giant);
 	/* Put packet on socket queue, if any */
 	sa = NULL;
 	nport = htons((u_int16_t)port);
@@ -253,7 +253,7 @@
 		INP_UNLOCK(inp);
 	}
 	INP_INFO_RUNLOCK(&divcbinfo);
-	NET_DROP_GIANT();
+	mtx_unlock(&Giant);
 	if (sa == NULL) {
 		m_freem(m);
 		ipstat.ips_noproto++;