From owner-svn-src-user@FreeBSD.ORG  Mon Mar 12 15:13:18 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27CC2106566C;
	Mon, 12 Mar 2012 15:13:18 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1779F8FC0A;
	Mon, 12 Mar 2012 15:13:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CFDH8E069530;
	Mon, 12 Mar 2012 15:13:17 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CFDHSD069528;
	Mon, 12 Mar 2012 15:13:17 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201203121513.q2CFDHSD069528@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Mon, 12 Mar 2012 15:13:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232867 - user/andre/tcp_workqueue/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 15:13:18 -0000

Author: andre
Date: Mon Mar 12 15:13:17 2012
New Revision: 232867
URL: http://svn.freebsd.org/changeset/base/232867

Log:
  Move *mp0 initialization for the direct mbuf dequeue case before the
  for() loop to correctly move the mbuf's.
  
  Reported by:	trociny

Modified:
  user/andre/tcp_workqueue/sys/kern/uipc_socket.c

Modified: user/andre/tcp_workqueue/sys/kern/uipc_socket.c
==============================================================================
--- user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Mon Mar 12 15:05:17 2012	(r232866)
+++ user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Mon Mar 12 15:13:17 2012	(r232867)
@@ -2045,6 +2045,10 @@ deliver:
 	if (mp0 != NULL) {
 		/* Dequeue as many mbufs as possible. */
 		if (!(flags & MSG_PEEK) && len >= sb->sb_mb->m_len) {
+			if (*mp0 == NULL)
+				*mp0 = sb->sb_mb;
+			else
+				m_cat(*mp0, sb->sb_mb);
 			for (m = sb->sb_mb;
 			     m != NULL && m->m_len <= len;
 			     m = m->m_next) {
@@ -2058,10 +2062,6 @@ deliver:
 			sb->sb_lastrecord = sb->sb_mb;
 			if (sb->sb_mb == NULL)
 				SB_EMPTY_FIXUP(sb);
-			if (*mp0 != NULL)
-				m_cat(*mp0, m);
-			else
-				*mp0 = m;
 		}
 		/* Copy the remainder. */
 		if (len > 0) {