From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 09:17:23 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01C831065674; Tue, 30 Mar 2010 09:17:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B90911065672
	for <perforce@FreeBSD.org>; Tue, 30 Mar 2010 09:17:22 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D55A8FC1C
	for <perforce@FreeBSD.org>; Tue, 30 Mar 2010 09:17:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2U9HMqD027034
	for <perforce@FreeBSD.org>; Tue, 30 Mar 2010 09:17:22 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2U9HMgX027032
	for perforce@freebsd.org; Tue, 30 Mar 2010 09:17:22 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 30 Mar 2010 09:17:22 GMT
Message-Id: <201003300917.o2U9HMgX027032@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176275 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Mar 2010 09:17:23 -0000

http://p4web.freebsd.org/chv.cgi?CH=176275

Change 176275 by anchie@anchie_malimis on 2010/03/30 09:16:35

	Still trying to get rid of the panic soreceive_generic().	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#36 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#36 (text+ko) ====

@@ -236,7 +236,7 @@
 {
     u_int len;
     struct ip6_hdr *ip6;
-    struct snd_hdr *snd_hdr;
+    struct snd_hdr *snd_hdr = NULL;
 
 printf("send_sendso_input \n");
                         
@@ -253,19 +253,29 @@
         if (len != msglen)
                 printf("XXX-BZ %s: (m)len=%u (ip6)msglen=%d", __func__, len, msglen);
                         
-	M_PREPEND(m, SEND_HDR_LEN, M_DONTWAIT);
-	if (m == NULL) {
-		m_freem(m);
-		return (ENOBUFS);
-	}
+printf("M_LEADINGSPACE(%d) >= SEND_HDR_LEN(%d)?\n", M_LEADINGSPACE(m), SEND_HDR_LEN);
+	if (M_LEADINGSPACE(m) >= SEND_HDR_LEN) {
+		M_PREPEND(m, SEND_HDR_LEN, M_PKTHDR|M_DONTWAIT);
+		snd_hdr = mtod(m, struct snd_hdr *);
+		snd_hdr->direction = direction;
+		snd_hdr->ifidx = -1;
+	} else {
+		struct mbuf *n;
+		MGET(n, M_PKTHDR|M_DONTWAIT, MT_DATA);
+		if (n == NULL) {
+			m_freem(m);
+			return ENOBUFS;
+		}	
 
-	m->m_flags &= M_PKTHDR;
-printf("MLEN: %d, MHLEN: %d, SEND_HDR_LEN: %d \n", MLEN, MHLEN, SEND_HDR_LEN);
+		snd_hdr = mtod(n, struct snd_hdr *);
+		snd_hdr->direction = direction;
+		snd_hdr->ifidx = -1;
 
-	snd_hdr = mtod(m, struct snd_hdr *);
-	snd_hdr->direction = direction;
-	snd_hdr->ifidx = -1;
-printf("direction: %d \n", snd_hdr->direction);
+		n->m_len = SEND_HDR_LEN;
+		n->m_next = m->m_next;
+		m->m_next = n;
+		m->m_pkthdr.len += SEND_HDR_LEN;
+	}
 
         /*
          * Send incoming or outgoing traffic to the user space either to be
@@ -275,7 +285,6 @@
 		SOCKBUF_LOCK(&s->so_rcv);
 		sbappendrecord_locked(&s->so_rcv, m);
 		sorwakeup_locked(s);
-printf("Nakon sorwakeup \n");
 		return 0;
 	}