From owner-p4-projects@FreeBSD.ORG  Mon Nov 26 05:27:24 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FFBC16A46D; Mon, 26 Nov 2007 05:27:24 +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 D91AE16A41A
	for <perforce@freebsd.org>; Mon, 26 Nov 2007 05:27:23 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8FDB13C4DD
	for <perforce@freebsd.org>; Mon, 26 Nov 2007 05:27:23 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAQ5RNnb090241
	for <perforce@freebsd.org>; Mon, 26 Nov 2007 05:27:23 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAQ5RNSw090238
	for perforce@freebsd.org; Mon, 26 Nov 2007 05:27:23 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 26 Nov 2007 05:27:23 GMT
Message-Id: <200711260527.lAQ5RNSw090238@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 129544 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 26 Nov 2007 05:27:24 -0000

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

Change 129544 by kmacy@kmacy:storage:toestack on 2007/11/26 05:26:43

	disable merging of data into existing mbufs if 
	new SB_TOE flag is set

Affected files ...

.. //depot/projects/toestack/sys/kern/uipc_sockbuf.c#3 edit
.. //depot/projects/toestack/sys/sys/socketvar.h#2 edit

Differences ...

==== //depot/projects/toestack/sys/kern/uipc_sockbuf.c#3 (text+ko) ====

@@ -760,6 +760,7 @@
 		}
 		if (n && (n->m_flags & M_EOR) == 0 &&
 		    M_WRITABLE(n) &&
+		    !(sb->sb_flags & SB_TOE) &&
 		    m->m_len <= MCLBYTES / 4 && /* XXX: Don't copy too much */
 		    m->m_len <= M_TRAILINGSPACE(n) &&
 		    n->m_type == m->m_type) {

==== //depot/projects/toestack/sys/sys/socketvar.h#2 (text+ko) ====

@@ -130,6 +130,7 @@
 #define	SB_NOINTR	0x40		/* operations not interruptible */
 #define	SB_AIO		0x80		/* AIO operations queued */
 #define	SB_KNOTE	0x100		/* kernel note attached */
+#define	SB_TOE		0x200		/* socket buffer for TOE connection */	
 #define	SB_AUTOSIZE	0x800		/* automatically size socket buffer */
 
 	void	(*so_upcall)(struct socket *, void *, int);