svn commit: r232867 - user/andre/tcp_workqueue/sys/kern

[Andre Oppermann]

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) {