PERFORCE change 41564 for review

[Sam Leffler]

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

Change 41564 by sam at sam_ebb on 2003/11/05 21:10:48

	must _always_ grab Giant to protect sbappendaddr

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_mroute.c#20 edit

Differences ...

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

@@ -1289,13 +1289,13 @@
 socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src)
 {
     if (s) {
-	NET_PICKUP_GIANT();
+	mtx_lock(&Giant);		/* XXX until sockets are locked */
 	if (sbappendaddr(&s->so_rcv, (struct sockaddr *)src, mm, NULL) != 0) {
 	    sorwakeup(s);
-	    NET_DROP_GIANT();
+	    mtx_unlock(&Giant);
 	    return 0;
 	}
-	NET_DROP_GIANT();
+	mtx_unlock(&Giant);
     }
     m_freem(mm);
     return -1;